diff --git a/OMPython/ModelicaSystem.py b/OMPython/ModelicaSystem.py
index 7acc372d..39d4dbe7 100644
--- a/OMPython/ModelicaSystem.py
+++ b/OMPython/ModelicaSystem.py
@@ -1066,11 +1066,10 @@ def simulate_cmd(
         if self._override_variables or self._simulate_options_override:
             override_file = result_file.parent / f"{result_file.stem}_override.txt"
 
-            override_content = (
-                    "\n".join([f"{key}={value}" for key, value in self._override_variables.items()])
-                    + "\n".join([f"{key}={value}" for key, value in self._simulate_options_override.items()])
-                    + "\n"
-            )
+            override_content = "\n".join([
+                "\n".join([f"{key}={value}" for key, value in self._override_variables.items()]),
+                "\n".join([f"{key}={value}" for key, value in self._simulate_options_override.items()])
+            ]).strip() + "\n"
 
             override_file.write_text(override_content)
             om_cmd.arg_set(key="overrideFile", val=override_file.as_posix())
diff --git a/OMPython/OMCSession.py b/OMPython/OMCSession.py
index 70fd644e..5444ab9d 100644
--- a/OMPython/OMCSession.py
+++ b/OMPython/OMCSession.py
@@ -903,10 +903,10 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
                             r"\s*lineEnd = (\d+),\n"
                             r"\s*columnEnd = (\d+)\n"
                             r"\s*end OpenModelica\.Scripting\.SourceInfo;,\n"
-                            r"\s*message = \"(.*?)\",\n"  # message
+                            r"\s*message = \"(.*)\",\n"  # message
                             r"\s*kind = \.OpenModelica\.Scripting\.ErrorKind\.(.*?),\n"  # kind
                             r"\s*level = \.OpenModelica\.Scripting\.ErrorLevel\.(.*?),\n"  # level
-                            r"\s*id = (\d+)",  # id
+                            r"\s*id = (-?\d+)",  # id
                     flags=re.MULTILINE | re.DOTALL)
 
             # extract all ErrorMessage records