diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManager.java b/app/src/main/java/uk/org/openseizuredetector/LogManager.java
index 5aa013b..c4c7dd3 100644
--- a/app/src/main/java/uk/org/openseizuredetector/LogManager.java
+++ b/app/src/main/java/uk/org/openseizuredetector/LogManager.java
@@ -472,6 +472,7 @@ public class LogManager {
             if (cursor != null) {
                 callback.accept(cursor2Json(cursor));
             } else {
+                Log.w(TAG,"getDatapointsByDate() - returned null result");
                 callback.accept(null);
             }
         }).execute();
@@ -973,8 +974,11 @@ public class LogManager {
                                     }
                                     // This starts the process of uploading the datapoints, one at a time.
                                     mCurrentEventRemoteId = eventId;
+                                    int listLen = 0;
+                                    if (mDatapointsToUploadList != null)
+                                        listLen = mDatapointsToUploadList.size();
                                     Log.v(TAG, "createEventCallback() - starting datapoints upload with eventId " + mCurrentEventRemoteId +
-                                            " Uploading " + mDatapointsToUploadList.size() + " datapoints");
+                                            " Uploading " + listLen + " datapoints");
                                     uploadNextDatapoint();
 
                                 });