diff --git a/include/boost/system/system_error.hpp b/include/boost/system/system_error.hpp
index f3f1701..bc4a848 100644
--- a/include/boost/system/system_error.hpp
+++ b/include/boost/system/system_error.hpp
@@ -43,8 +43,12 @@ private:
             r += ": ";
         }
 
+        r += ec.message();
+
         if( ec.has_location() )
         {
+            r += " [";
+
             boost::source_location loc = ec.location();
 
             r += loc.file_name();
@@ -63,11 +67,9 @@ private:
             r += "\': ";
 
             r += ec.to_string();
-            r += ": ";
+            r += "]";
         }
 
-        r += ec.message();
-
         return r;
     }