diff --git a/src/apps.js b/src/apps.js
index 139901e29..a71a0f24a 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -84,7 +84,7 @@ function AppsError(reason, errorOrMessage) {
 
     this.name = this.constructor.name;
     this.reason = reason;
-    if (typeof errorOrMessage === 'undefined') {
+    if (typeof errorOrMessage === 'undefined' || errorOrMessage === null) {
         this.message = reason;
     } else if (typeof errorOrMessage === 'string') {
         this.message = errorOrMessage;
diff --git a/src/databaseerror.js b/src/databaseerror.js
index 2dfa89f3f..f436cb592 100644
--- a/src/databaseerror.js
+++ b/src/databaseerror.js
@@ -9,11 +9,12 @@ var assert = require('assert'),
 
 function DatabaseError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
-    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined' || errorOrMessage === null);
+    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
 
     Error.call(this);
     Error.captureStackTrace(this, this.constructor);
 
+    this.name = this.constructor.name;
     this.reason = reason;
     if (typeof errorOrMessage === 'undefined' || errorOrMessage === null) {
         this.message = reason;