diff --git a/frappe/__init__.py b/frappe/__init__.py
index 5827541590..1ebaebce97 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1515,6 +1515,8 @@ def log_error(message=None, title=None):
 			error = get_traceback()
 		else:
 			error = message
+	else:
+		error = get_traceback()
 
 	return get_doc(dict(doctype='Error Log', error=as_unicode(error),
 		method=title)).insert(ignore_permissions=True)
diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
index 609cfd06a1..c08afa179a 100644
--- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
+++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
@@ -34,8 +34,8 @@ class ScheduledJobType(Document):
 					enqueue('frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job',
 						queue = self.get_queue_name(), job_type=self.method)
 					return True
-				else:
-					return False
+
+		return False
 
 	def is_event_due(self, current_time = None):
 		'''Return true if event is due based on time lapsed since last execution'''
diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py
index c1b03f7251..b8c46d376f 100644
--- a/frappe/tests/test_scheduler.py
+++ b/frappe/tests/test_scheduler.py
@@ -37,11 +37,14 @@ class TestScheduler(TestCase):
 				last_execution = '2010-01-01 00:00:00',
 				queue = 'All'
 			)).insert()
+			frappe.db.commit()
 		else:
 			job = frappe.get_doc('Scheduled Job Type', 'test_scheduler.test_timeout')
 
 		self.assertTrue(job.enqueue())
-		print(get_jobs(site=frappe.local.site, key='job_type'))
+		job.db_set('last_execution', '2010-01-01 00:00:00')
+		frappe.db.commit()
+		time.sleep(1) # wait if job is not yet queued
 		self.assertFalse(job.enqueue())
 		job.delete()