diff --git a/src/se/hal/struct/Event.java b/src/se/hal/struct/Event.java
index c6e3e4e8..ef794cf5 100755
--- a/src/se/hal/struct/Event.java
+++ b/src/se/hal/struct/Event.java
@@ -52,11 +52,13 @@ public class Event extends AbstractDevice<HalEventConfig,HalEventData>{
             if (deviceDataClass == null)
                 throw new ClassNotFoundException("Unknown event data class for: " + getDeviceConfig().getClass());
 
-            PreparedStatement stmt = db.getPreparedStatement(
-                    "SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1");
-            stmt.setLong(1, getId());
-            return (HalEventData)
-                    DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
+            if (getId() != null) {
+                PreparedStatement stmt = db.getPreparedStatement(
+                        "SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1");
+                stmt.setLong(1, getId());
+                return (HalEventData)
+                        DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
+            }
         } catch (Exception e){
             logger.log(Level.WARNING, null, e);
         }
diff --git a/src/se/hal/struct/Sensor.java b/src/se/hal/struct/Sensor.java
index bdb09401..25bd6fe2 100755
--- a/src/se/hal/struct/Sensor.java
+++ b/src/se/hal/struct/Sensor.java
@@ -121,11 +121,13 @@ public class Sensor extends AbstractDevice<HalSensorConfig,HalSensorData>{
             if (deviceDataClass == null)
                 throw new ClassNotFoundException("Unknown sensor data class for: " + getDeviceConfig().getClass());
 
-            PreparedStatement stmt = db.getPreparedStatement(
-                    "SELECT data FROM sensor_data_raw WHERE sensor_id == ? ORDER BY timestamp DESC LIMIT 1");
-            stmt.setLong(1, getId());
-            return (HalSensorData)
-                    DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
+            if (getId() != null) {
+                PreparedStatement stmt = db.getPreparedStatement(
+                        "SELECT data FROM sensor_data_raw WHERE sensor_id == ? ORDER BY timestamp DESC LIMIT 1");
+                stmt.setLong(1, getId());
+                return (HalSensorData)
+                        DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));
+            }
         } catch (Exception e){
             logger.log(Level.WARNING, null, e);
         }