diff --git a/server/jsonrpcserver.cpp b/server/jsonrpcserver.cpp
index 8325bcfc..cf5b1d5a 100644
--- a/server/jsonrpcserver.cpp
+++ b/server/jsonrpcserver.cpp
@@ -146,10 +146,15 @@ void JsonRPCServer::handleActionMessage(int clientId, int commandId, const QStri
         Action action(deviceId);
         action.setParams(actionParams);
 
-        HiveCore::instance()->deviceManager()->executeAction(action);
-
-        sendResponse(clientId, commandId);
-
+        DeviceManager::DeviceError error = HiveCore::instance()->deviceManager()->executeAction(action);
+        switch (error) {
+        case DeviceManager::DeviceErrorNoError:
+            sendResponse(clientId, commandId);
+            break;
+        case DeviceManager::DeviceErrorDeviceNotFound:
+            sendErrorResponse(clientId, commandId, "No such device");
+            break;
+        }
     }
 }