diff --git a/clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java b/clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java
index 67f9d383d..574a12be1 100644
--- a/clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java
+++ b/clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java
@@ -515,10 +515,10 @@ public synchronized ArrayList<CTMessageDAO> getMessages(String userId) {
             return messageDAOArrayList;
         } catch (final SQLiteException e) {
             getConfigLogger().verbose("Error retrieving records from " + tName, e);
-            return null;
+            return messageDAOArrayList;
         } catch (JSONException e) {
             getConfigLogger().verbose("Error retrieving records from " + tName, e.getMessage());
-            return null;
+            return messageDAOArrayList;
         } finally {
             dbHelper.close();
         }