diff --git a/packages/playout-gateway/src/tsrHandler.ts b/packages/playout-gateway/src/tsrHandler.ts
index e5391c0021..dbeb9e0319 100644
--- a/packages/playout-gateway/src/tsrHandler.ts
+++ b/packages/playout-gateway/src/tsrHandler.ts
@@ -265,6 +265,12 @@ export class TSRHandler {
 			const device = this._coreTsrHandlers[id]?._device
 			const name = `Device "${device?.deviceName ?? id}" (${device?.instanceId ?? 'instance unknown'})`
 
+			if (!e || !('message' in e)) {
+				return {
+					message: name + ': ' + 'Unknown error: ' + JSON.stringify(e),
+				}
+			}
+
 			return {
 				message: e.message && name + ': ' + e.message,
 				name: e.name && name + ': ' + e.name,
@@ -370,7 +376,7 @@ export class TSRHandler {
 		this.tsr.connectionManager.on('connectionEvent:debug', (id, ...args) => {
 			const device = this._coreTsrHandlers[id]?._device
 
-			if (!device?.debugLogging && !this._coreHandler.logDebug) {
+			if (!this._coreHandler.logDebug) {
 				return
 			}
 			if (args.length === 0) {