diff --git a/src/signaling/api_signaling.go b/src/signaling/api_signaling.go
index 8fdebe5..c43351b 100644
--- a/src/signaling/api_signaling.go
+++ b/src/signaling/api_signaling.go
@@ -104,6 +104,10 @@ func (m *ClientMessage) NewErrorServerMessage(e *Error) *ServerMessage {
 }
 
 func (m *ClientMessage) NewWrappedErrorServerMessage(e error) *ServerMessage {
+	if e, ok := e.(*Error); ok {
+		return m.NewErrorServerMessage(e)
+	}
+
 	return m.NewErrorServerMessage(NewError("internal_error", e.Error()))
 }