1 files changed, 5 insertions, 2 deletions
diff --git a/bordeaux/service/src/android/bordeaux/services/AggregatorRecordStorage.java b/bordeaux/service/src/android/bordeaux/services/AggregatorRecordStorage.java
index 5c407b75d..4bf677f59 100644
--- a/bordeaux/service/src/android/bordeaux/services/AggregatorRecordStorage.java
+++ b/bordeaux/service/src/android/bordeaux/services/AggregatorRecordStorage.java
@@ -100,8 +100,11 @@ class AggregatorRecordStorage extends AggregatorStorage {
         do {
             HashMap<String, String> oneRow = new HashMap<String, String>();
             for (String column : mColumnNames) {
-                String value = cursor.getString(cursor.getColumnIndex(column));
-                oneRow.put(column, value);
+                int columnIndex = cursor.getColumnIndex(column);
+                if (!cursor.isNull(columnIndex)) {
+                    String value = cursor.getString(columnIndex);
+                    oneRow.put(column, value);
+                }
             }
             allData.add(oneRow);
         } while (cursor.moveToNext());