1 files changed, 2 insertions, 2 deletions
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java b/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
index 708f8edb..14728ad0 100644
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
@@ -64,7 +64,7 @@ public class OnapHttpCommand extends OnapCommand {
 
     private OnapCommandHttpService oclipService = new OnapCommandHttpService();
 
-    private MocoServer mocoServer;
+    private MocoServer mocoServer = null;
 
     boolean shouldVerify = false;
 
@@ -194,7 +194,7 @@ public class OnapHttpCommand extends OnapCommand {
 
     @Override
     protected void postRun() throws OnapCommandException {
-        if (shouldVerify && mockingEnabled) {
+        if (mocoServer != null) {
             mocoServer.stop();
         }
     }