diff --git a/tools/dotnet-aspnet-codegenerator/ScaffoldingServer.cs b/tools/dotnet-aspnet-codegenerator/ScaffoldingServer.cs
index 1987c049d..d24b9bb36 100644
--- a/tools/dotnet-aspnet-codegenerator/ScaffoldingServer.cs
+++ b/tools/dotnet-aspnet-codegenerator/ScaffoldingServer.cs
@@ -180,9 +180,9 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _server.Stop();
-                    _writer.Dispose();
-                    _reader.Dispose();
-                    _socket.Dispose();
+                    _writer?.Dispose();
+                    _reader?.Dispose();
+                    _socket?.Dispose();
                 }
 
                 disposedValue = true;