diff --git a/src/se/hal/struct/Event.java b/src/se/hal/struct/Event.java
index f7b40daa..c6e3e4e8 100755
--- a/src/se/hal/struct/Event.java
+++ b/src/se/hal/struct/Event.java
@@ -50,7 +50,7 @@ public class Event extends AbstractDevice<HalEventConfig,HalEventData>{
         try {
             Class deviceDataClass = getDeviceConfig().getEventDataClass();
             if (deviceDataClass == null)
-                throw new ClassNotFoundException("Unknown device data class for: " + getDeviceConfig().getClass());
+                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");
diff --git a/src/se/hal/struct/Sensor.java b/src/se/hal/struct/Sensor.java
index 50aedc28..bdb09401 100755
--- a/src/se/hal/struct/Sensor.java
+++ b/src/se/hal/struct/Sensor.java
@@ -119,10 +119,10 @@ public class Sensor extends AbstractDevice<HalSensorConfig,HalSensorData>{
         try {
             Class deviceDataClass = getDeviceConfig().getSensorDataClass();
             if (deviceDataClass == null)
-                throw new ClassNotFoundException("Unknown device data class for: " + getDeviceConfig().getClass());
+                throw new ClassNotFoundException("Unknown sensor data class for: " + getDeviceConfig().getClass());
 
             PreparedStatement stmt = db.getPreparedStatement(
-                    "SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1");
+                    "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));