1 files changed, 3 insertions, 4 deletions
diff --git a/src/main.lib/Clients/Acme/AcmeClient.cs b/src/main.lib/Clients/Acme/AcmeClient.cs
index afe276f..f6ca381 100644
--- a/src/main.lib/Clients/Acme/AcmeClient.cs
+++ b/src/main.lib/Clients/Acme/AcmeClient.cs
@@ -83,7 +83,6 @@ namespace PKISharp.WACS.Clients.Acme
             {
                 signer = accountSigner.JwsTool();
             }
-
             var httpClient = _proxyService.GetHttpClient();
             httpClient.BaseAddress = _settings.BaseUri;
             var client = PrepareClient(httpClient, signer);
@@ -157,7 +156,7 @@ namespace PKISharp.WACS.Clients.Acme
             }
             if (_client == null)
             {
-                throw new InvalidOperationException();
+                throw new InvalidOperationException("Failed to initialize AcmeProtocolClient");
             }
             return _client;
         }
@@ -294,7 +293,7 @@ namespace PKISharp.WACS.Clients.Acme
             _log.Verbose("Writing terms of service to {path}", tosPath);
             await File.WriteAllBytesAsync(tosPath, content);
             _input.Show($"Terms of service", tosPath);
-            if (_arguments.GetArguments<AccountArguments>().AcceptTos)
+            if (_arguments.GetArguments<AccountArguments>()?.AcceptTos ?? false)
             {
                 return true;
             }
@@ -655,4 +654,4 @@ namespace PKISharp.WACS.Clients.Acme
             Dispose(true);// TODO: uncomment the following line if the finalizer is overridden above.// GC.SuppressFinalize(this);
         #endregion
     }
-}
-\ No newline at end of file
+}