Add null check to query builder

1 files changed, 7 insertions, 4 deletions

diff --git a/src/org/traccar/database/QueryBuilder.java b/src/org/traccar/database/QueryBuilder.java
index c5a682b7e..73569ac2a 100644
--- a/src/org/traccar/database/QueryBuilder.java
+++ b/src/org/traccar/database/QueryBuilder.java
@@ -357,10 +357,13 @@ public final class QueryBuilder {
             processors.add(new ResultSetProcessor<T>() {
                 @Override
                 public void process(T object, ResultSet resultSet) throws SQLException {
-                    try (JsonReader reader = Json.createReader(new StringReader(resultSet.getString(name)))) {
-                        method.invoke(object, MiscFormatter.fromJson(reader.readObject()));
-                    } catch (IllegalAccessException | InvocationTargetException | JsonParsingException error) {
-                        Log.warning(error);
+                    String value = resultSet.getString(name);
+                    if (value != null) {
+                        try (JsonReader reader = Json.createReader(new StringReader(value))) {
+                            method.invoke(object, MiscFormatter.fromJson(reader.readObject()));
+                        } catch (IllegalAccessException | InvocationTargetException | JsonParsingException error) {
+                            Log.warning(error);
+                        }
                     }
                 }
             });