1 files changed, 8 insertions, 2 deletions
diff --git a/src/org/traccar/http/JsonConverter.java b/src/org/traccar/http/JsonConverter.java
index 48fd934b7..0802fb9ea 100644
--- a/src/org/traccar/http/JsonConverter.java
+++ b/src/org/traccar/http/JsonConverter.java
@@ -93,9 +93,15 @@ public class JsonConverter {
                     } else if (method.getReturnType().equals(double.class)) {
                         json.add(name, (Double) method.invoke(object));
                     } else if (method.getReturnType().equals(String.class)) {
-                        json.add(name, (String) method.invoke(object));
+                        String value = (String) method.invoke(object);
+                        if (value != null) {
+                            json.add(name, value);
+                        }
                     } else if (method.getReturnType().equals(Date.class)) {
-                        json.add(name, dateFormat.format((Date) method.invoke(object)));
+                        Date value = (Date) method.invoke(object);
+                        if (value != null) {
+                            json.add(name, dateFormat.format(value));
+                        }
                     }
                 } catch (IllegalAccessException error) {
                 } catch (InvocationTargetException error) {