diff --git a/src/libplctag.Tests/AsyncTests.cs b/src/libplctag.Tests/AsyncTests.cs
index 67a198b..028f6a1 100644
--- a/src/libplctag.Tests/AsyncTests.cs
+++ b/src/libplctag.Tests/AsyncTests.cs
@@ -70,7 +70,7 @@ public async Task Timeout_throws_a_LibPlcTagException()
             });
 
             // Assert
-            Assert.Equal(Status.ErrorTimeout.ToString(), ex.Message);
+            Assert.Equal(Status.ErrorTimeout, ex.Status);
         }
 
         [Fact]
diff --git a/src/libplctag.Tests/DisposeTests.cs b/src/libplctag.Tests/DisposeTests.cs
index 40a497f..ea2f245 100644
--- a/src/libplctag.Tests/DisposeTests.cs
+++ b/src/libplctag.Tests/DisposeTests.cs
@@ -64,7 +64,7 @@ public async Task GithubIssue418()
                 {
                     await tag.InitializeAsync();
                 }
-                catch (Exception e) when (e.Message == "ErrorNotFound") // we are expecting this exception
+                catch (LibPlcTagException e) when (e.Status == Status.ErrorNotFound) // we are expecting this exception
                 {
                 }
             }
diff --git a/src/libplctag/LibPlcTagException.cs b/src/libplctag/LibPlcTagException.cs
index 57d8dae..8c43016 100644
--- a/src/libplctag/LibPlcTagException.cs
+++ b/src/libplctag/LibPlcTagException.cs
@@ -15,6 +15,8 @@ namespace libplctag
     /// </summary>
     public class LibPlcTagException : Exception
     {
+        public Status Status { get; }
+
         public LibPlcTagException()
         {
         }
@@ -32,6 +34,7 @@ public LibPlcTagException(string message, Exception inner)
         public LibPlcTagException(Status status)
             : base(status.ToString())
         {
+            Status = status;
         }
     }
 }