diff --git a/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java b/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
index d58b48dc9..d785b41b3 100644
--- a/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
+++ b/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
@@ -241,7 +241,8 @@ public class ImageEntry {
 
     // convenience method
 
-    private static long toLong(Object o) {
+    private static Long toLong(Object o) {
+        if (o == null) return null;
         if (o instanceof Integer) return Long.valueOf((Integer) o);
         return (long) o;
     }