diff --git a/cron.php b/cron.php
index 4c86407b94..ba17c89989 100644
--- a/cron.php
+++ b/cron.php
@@ -122,8 +122,11 @@ try {
 			// Work and success :-)
 			$jobList = \OC::$server->getJobList();
 			$job = $jobList->getNext();
-			$job->execute($jobList, $logger);
-			$jobList->setLastJob($job);
+			if ($job != null)
+			{
+				$job->execute($jobList, $logger);
+				$jobList->setLastJob($job);
+			}
 			OC_JSON::success();
 		}
 	}