diff --git a/Netdisco/Changes b/Netdisco/Changes
index 07025b6c..2b564b34 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,9 +1,10 @@
-2.029013 - 
+2.029013_001 - 2014-11-13
 
   [BUG FIXES]
 
   * Fix for latest DBIx::Class (deploy)
   * Fix for latest Dancer (YAML::XS)
+  * [#160] Job Queue fatal error on num_slots
 
 2.029012 - 2014-10-09
 
diff --git a/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm b/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm
index 02d77d3a..e9838228 100644
--- a/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm
+++ b/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm
@@ -27,17 +27,16 @@ our %EXPORT_TAGS = ( all => \@EXPORT_OK );
 
 sub jq_getsome {
   my ($num_slots, $prio) = @_;
-  return () if defined $num_slots and $num_slots eq '0';
-  $num_slots ||= 1;
+  return () if ((!defined $num_slots) or ($num_slots < 1));
   $prio ||= 'normal';
-  my @returned = ();
 
   my $rs = schema('netdisco')->resultset('Admin')
     ->search(
       {status => 'queued', action => { -in => setting('job_prio')->{$prio} } },
-      {order_by => 'random()', rows => ($num_slots || 1)},
+      {order_by => 'random()', rows => $num_slots},
     );
 
+  my @returned = ();
   while (my $job = $rs->next) {
       push @returned, App::Netdisco::Daemon::Job->new({ $job->get_columns });
   }