diff --git a/Frameworks/MQTTnet.NetStandard/MqttFactory.cs b/Frameworks/MQTTnet.NetStandard/MqttFactory.cs
index ede45c62..50cdddea 100644
--- a/Frameworks/MQTTnet.NetStandard/MqttFactory.cs
+++ b/Frameworks/MQTTnet.NetStandard/MqttFactory.cs
@@ -98,7 +98,7 @@ namespace MQTTnet
                 _serviceProvider.GetRequiredService<IOptions<MqttServerOptions>>(),
                 clientSessionsManager,
                 _serviceProvider.GetRequiredService<MqttClientSubscriptionsManager>(),
-                _serviceProvider.GetRequiredService<ILogger<MqttClientSession>>(), 
+                _serviceProvider.GetRequiredService<ILogger<MqttClientSession>>(),
                 _serviceProvider.GetRequiredService<ILogger<MqttClientPendingMessagesQueue>>());
         }
 
@@ -119,8 +119,9 @@ namespace MQTTnet
 
         public IMqttServer CreateMqttServer(Action<MqttServerOptions> configure)
         {
-            var options = _serviceProvider.GetRequiredService<IOptions<MqttServerOptions>>();
+            if (configure == null) throw new ArgumentNullException(nameof(configure));
 
+            var options = _serviceProvider.GetRequiredService<IOptions<MqttServerOptions>>();
             configure(options.Value);
 
             return _serviceProvider.GetRequiredService<IMqttServer>();
diff --git a/Frameworks/MQTTnet.UniversalWindows/MqttFactory.cs b/Frameworks/MQTTnet.UniversalWindows/MqttFactory.cs
index 9a0721ff..67b8fe6d 100644
--- a/Frameworks/MQTTnet.UniversalWindows/MqttFactory.cs
+++ b/Frameworks/MQTTnet.UniversalWindows/MqttFactory.cs
@@ -111,5 +111,15 @@ namespace MQTTnet
         {
             return _serviceProvider.GetRequiredService<IMqttServer>();
         }
+
+        public IMqttServer CreateMqttServer(Action<MqttServerOptions> configure)
+        {
+            if (configure == null) throw new ArgumentNullException(nameof(configure));
+
+            var options = _serviceProvider.GetRequiredService<IOptions<MqttServerOptions>>();
+            configure(options.Value);
+
+            return _serviceProvider.GetRequiredService<IMqttServer>();
+        }
     }
 }
\ No newline at end of file