diff --git a/lib/API/ErrorResponse.php b/lib/API/ErrorResponse.php
index d650732ca1..3c3c852059 100644
--- a/lib/API/ErrorResponse.php
+++ b/lib/API/ErrorResponse.php
@@ -13,7 +13,7 @@ class ErrorResponse extends Response {
 
   function getData() {
     if(empty($this->errors)) {
-      return false;
+      return null;
     } else {
       return array(
         'errors' => $this->errors
diff --git a/lib/API/SuccessResponse.php b/lib/API/SuccessResponse.php
index d3be62ae00..97bc5b91f8 100644
--- a/lib/API/SuccessResponse.php
+++ b/lib/API/SuccessResponse.php
@@ -6,7 +6,7 @@ if(!defined('ABSPATH')) exit;
 class SuccessResponse extends Response {
   public $data;
 
-  function __construct($data = null, $meta = null, $status = self::STATUS_OK) {
+  function __construct($data = array(), $meta = array(), $status = self::STATUS_OK) {
     parent::__construct($status, $meta);
     $this->data = $data;
   }