pythonthings
diff --git a/‎atest/tests/failures.txt‎
Lines changed: 3 additions & 0 deletions b/‎atest/tests/failures.txt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/robotremoteserver.py‎
Lines changed: 3 additions & 2 deletions b/‎src/robotremoteserver.py‎
Lines changed: 3 additions & 2 deletions
@@ -32,6 +32,9 @@ Non-ASCII message
 Non-ASCII bytes
     Exception    'Hyv\\xe4'    Hyv\uFFFD    evaluate=yes
 
+Binary message
+    Exception    \x00.\x01.\x02
+
 Failure deeper
     [Documentation]    FAIL Finally failing
     [Template]    NONE
 
@@ -177,9 +177,10 @@ def _get_error_message(self, exc_type, exc_value):
     def _get_message_from_exception(self, value):
         # UnicodeError occurs below 2.6 and if message contains non-ASCII bytes
         try:
-            return unicode(value)
+            msg = unicode(value)
         except UnicodeError:
-            return ' '.join([unicode(a, errors='replace') for a in value.args])
+            msg = ' '.join([unicode(a, errors='replace') for a in value.args])
+        return self._handle_binary_result(msg)
 
     def _get_error_traceback(self, exc_tb):
         # Latest entry originates from this class so it can be removed