diff --git a/apptentive/src/com/apptentive/android/sdk/module/engagement/logic/FieldManager.java b/apptentive/src/com/apptentive/android/sdk/module/engagement/logic/FieldManager.java
index <HASH>..<HASH> 100644
--- a/apptentive/src/com/apptentive/android/sdk/module/engagement/logic/FieldManager.java
+++ b/apptentive/src/com/apptentive/android/sdk/module/engagement/logic/FieldManager.java
@@ -143,7 +143,9 @@ public class FieldManager {
 			case device: {
 				QueryPart subQuery = QueryPart.parse(tokens[1]);
 				Device device = DeviceManager.getStoredDevice(context);
-
+				if (device == null) {
+					return null;
+				}
 				switch (subQuery) {
 					case custom_data:
 						String customDataKey = tokens[2];
If device is null, return null from FieldManager.