diff --git a/src/services/sql.js b/src/services/sql.js
index 1b20eaff2..ea2a18cbc 100644
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -26,7 +26,7 @@ const LOG_ALL_QUERIES = false;
 });
 
 function insert(tableName, rec, replace = false) {
-    const keys = Object.keys(rec);
+    const keys = Object.keys(rec || {});
     if (keys.length === 0) {
         log.error(`Can't insert empty object into table ${tableName}`);
         return;
@@ -53,7 +53,7 @@ function replace(tableName, rec) {
 }
 
 function upsert(tableName, primaryKey, rec) {
-    const keys = Object.keys(rec);
+    const keys = Object.keys(rec || {});
     if (keys.length === 0) {
         log.error(`Can't upsert empty object into table ${tableName}`);
         return;
diff --git a/src/services/sync_update.js b/src/services/sync_update.js
index 1585c3855..c7f81afd7 100644
--- a/src/services/sync_update.js
+++ b/src/services/sync_update.js
@@ -59,6 +59,10 @@ function updateNormalEntity(remoteEC, remoteEntityRow, instanceId) {
             }
         }
 
+        if (!remoteEntityRow) {
+            throw new Error(`Empty entity row for: ${JSON.stringify(remoteEC)}`);
+        }
+
         sql.replace(remoteEC.entityName, remoteEntityRow);
 
         if (!localEC || localEC.utcDateChanged < remoteEC.utcDateChanged) {