diff --git a/src/browser/database-manager.coffee b/src/browser/database-manager.coffee
index d8e16cd47..237ffbc82 100644
--- a/src/browser/database-manager.coffee
+++ b/src/browser/database-manager.coffee
@@ -72,7 +72,7 @@ class DatabaseManager
       return
 
     @_query db, query, values, (err, result) ->
-      errJSONString = JSON.stringify(err)
+      errJSONString = if err then JSON.stringify(err) else null
       event.sender.send('database-result', {queryKey, errJSONString, result})
 
   # Resolves when a new database has been created and the initial setup