diff --git a/funf_v4/src/main/java/edu/mit/media/funf/FunfManager.java b/funf_v4/src/main/java/edu/mit/media/funf/FunfManager.java
index d38270d..30c8e4b 100644
--- a/funf_v4/src/main/java/edu/mit/media/funf/FunfManager.java
+++ b/funf_v4/src/main/java/edu/mit/media/funf/FunfManager.java
@@ -540,7 +540,12 @@ public void requestData(DataListener listener, JsonElement probeConfig, Schedule
 			throw new IllegalArgumentException("Probe config cannot be null");
 		}
 		// Use schedule in probeConfig @schedule annotation
-		Probe probe = gson.fromJson(probeConfig, Probe.class);
+		Probe probe = null;
+		try {
+			probe = gson.fromJson(probeConfig, Probe.class);
+		} catch (NullPointerException e) {
+			return;
+		}
 		probe.addStateListener(probeStateListener);
 		if (schedule == null) {
 			DefaultSchedule defaultSchedule = probe.getClass().getAnnotation(DefaultSchedule.class);