diff --git a/Source/MQTTnet/Extensions/UserPropertyExtension.cs b/Source/MQTTnet/Extensions/UserPropertyExtension.cs
index e950141b..5bb28cf9 100644
--- a/Source/MQTTnet/Extensions/UserPropertyExtension.cs
+++ b/Source/MQTTnet/Extensions/UserPropertyExtension.cs
@@ -25,7 +25,7 @@ namespace MQTTnet.Extensions
             }
             catch (Exception ex)
             {
-                throw new InvalidOperationException($"Cannot convert value({value}) of UserProperty({propertyName}) to {typeof(T).FullName}.", ex);
+                throw new InvalidOperationException($"Cannot convert value({value ?? "null"}) of UserProperty({propertyName}) to {typeof(T).FullName}.", ex);
             }
         }
     }
diff --git a/Tests/MQTTnet.Core.Tests/MqttApplicationMessage_Tests.cs b/Tests/MQTTnet.Core.Tests/MqttApplicationMessage_Tests.cs
index 073e4c43..6b791dc3 100644
--- a/Tests/MQTTnet.Core.Tests/MqttApplicationMessage_Tests.cs
+++ b/Tests/MQTTnet.Core.Tests/MqttApplicationMessage_Tests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Extensions;
@@ -24,6 +25,9 @@ namespace MQTTnet.Tests
             Assert.AreEqual("bar", message.GetUserProperty("foo"));
             Assert.AreEqual(1011, message.GetUserProperty<int>("value"));
             Assert.AreEqual("insensitive", message.GetUserProperty("case"));
+            Assert.AreEqual(null, message.GetUserProperty("nonExists"));
+            Assert.AreEqual(null, message.GetUserProperty<int?>("nonExists"));
+            Assert.ThrowsException<InvalidOperationException>(() => message.GetUserProperty<int>("nonExists"));
         }
     }
 }