diff --git a/go/storage/storage.go b/go/storage/storage.go
index 70e01a08..3f782580 100644
--- a/go/storage/storage.go
+++ b/go/storage/storage.go
@@ -66,6 +66,8 @@ func Connect() (Service, error) {
 // Close frees all resources associated with a volume.
 func (svc *Service) Close() {
 	svc.wmiIntf.Release()
-	svc.wmiSvc.Release()
+	if svc.wmiSvc != nil {
+		svc.wmiSvc.Release()
+	}
 	comshim.Done()
 }