diff --git a/addons/diagnostic/fnc_error.sqf b/addons/diagnostic/fnc_error.sqf
index c4d588077..2dda59e1e 100644
--- a/addons/diagnostic/fnc_error.sqf
+++ b/addons/diagnostic/fnc_error.sqf
@@ -36,7 +36,7 @@ params [
 _prefix = toUpper _prefix;
 
 // RPT log
-diag_log text format ["[%1] (%2) ERROR: %3 File: %4 Line: %5", _prefix, _component, _title, _file, _lineNum];
+diag_log text format ["[%1] (%2) ERROR: %3 %4:%5", _prefix, _component, _title, _file, _lineNum];
 
 private _lines = [_message, "\n"] call CBA_fnc_split;
 
diff --git a/addons/main/script_macros_common.hpp b/addons/main/script_macros_common.hpp
index 6ec4906ff..b45ad57df 100644
--- a/addons/main/script_macros_common.hpp
+++ b/addons/main/script_macros_common.hpp
@@ -142,7 +142,7 @@ Macros: DEBUG_MODE_x
 #define LOG_SYS(LEVEL,MESSAGE) LOG_SYS_FORMAT(LEVEL,MESSAGE) call CBA_fnc_log
 #endif
 
-#define LOG_SYS_FILELINENUMBERS(LEVEL,MESSAGE) LOG_SYS(LEVEL,format [ARR_4('%1 File: %2 Line: %3',MESSAGE,__FILE__,__LINE__ + 1)])
+#define LOG_SYS_FILELINENUMBERS(LEVEL,MESSAGE) LOG_SYS(LEVEL,format [ARR_4('%1 %2:%3',MESSAGE,__FILE__,__LINE__ + 1)])
 
 /* -------------------------------------------
 Macro: LOG()
@@ -287,8 +287,6 @@ Macro: ERROR_WITH_TITLE()
     The title can be specified (in <ERROR()> the heading is always just "ERROR")
     Newlines (\n) in the MESSAGE will be put on separate lines.
 
-    TODO: Popup an error dialog & throw an exception.
-
 Parameters:
     TITLE - Title of error message <STRING>
     MESSAGE -  Body of error message <STRING>