diff --git a/server/Fury/Modules/ErrorHandler/ErrorHandler.php b/server/Fury/Modules/ErrorHandler/ErrorHandler.php
index dbd2b05..09f6456 100644
--- a/server/Fury/Modules/ErrorHandler/ErrorHandler.php
+++ b/server/Fury/Modules/ErrorHandler/ErrorHandler.php
@@ -41,8 +41,7 @@
 		set_exception_handler([$this, "exception_handler"]);
 	}
 
-	// FIXME
-	public function exception_handler(\Exception $e) {
+	public function exception_handler(\Throwable $e) {
 		$this -> error_handler(
 			$e -> getCode(),
 			$e -> getMessage(),
diff --git a/server/SHServ/Models/Devices.php b/server/SHServ/Models/Devices.php
index 85c3089..d77e015 100644
--- a/server/SHServ/Models/Devices.php
+++ b/server/SHServ/Models/Devices.php
@@ -125,7 +125,8 @@
 		$response = $device -> device_api() -> reset();
 		$device_msg = "";
 
-		if($response["http_code"] == 200 && ($response["data"]["status"] ?? null) == "ok") {
+		$status = is_array($response["data"]) ? ($response["data"]["status"] ?? null) : null;
+		if($response["http_code"] == 200 && $status == "ok") {
 			$device_msg = $response["data"]["message"] ?? "";
 		} else {
 			$device_msg = app() -> text_msg("device_removed_offline");