diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManager.java b/app/src/main/java/uk/org/openseizuredetector/LogManager.java
index 6e46344..c5df64f 100644
--- a/app/src/main/java/uk/org/openseizuredetector/LogManager.java
+++ b/app/src/main/java/uk/org/openseizuredetector/LogManager.java
@@ -801,7 +801,9 @@ public class LogManager {
     // to upload the next one.
     public void datapointCallback(String datapointStr) {
         Log.v(TAG, "datapointCallback() " + datapointStr + ", mCurrentEventId=" + mCurrentEventId);
-        mDatapointsToUploadList.remove(0);
+        if (mDatapointsToUploadList.size() > 0) {
+            mDatapointsToUploadList.remove(0);
+        }
         setDatapointToUploaded(mCurrentDatapointId, mCurrentEventId);
         uploadNextDatapoint();
     }