diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
index 862198ca2..5928ced49 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
@@ -34,7 +34,6 @@ class Constants {
     static final String WINDOWS_EXTENSION_BAT = ".bat";
     static final String MAC_HAXM_EXTENSION = ".sh";
     static final String MAC_DARWIN = "darwin";
-
     // System properties
     static final String SDK_TOOLS_URL = "sdk.tools.url";
     static final String PLATFORM_TOOLS_URL = "platform.tools.url";
@@ -47,7 +46,6 @@ class Constants {
     static final String DOWNLOADED_PLATFORM_NAME = "downloaded.platform.name";
     static final String TARGET_VERSION =  "target.version";
     static final String OS_TARGET = "os.target";
-
     // WSO2 AVD specific variables
     static final String WSO2_AVD_NAME = "WSO2_AVD";
     static final String APK_LOCATION = File.separator + "resources" + File.separator + "android-agent.apk";
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
index f6c160bf0..3acad6737 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
@@ -100,7 +100,7 @@ public class TryIt {
         } catch (IOException | InterruptedException ignored) {
             // script can continue without this process
         }
-        System.out.println("Good Bye!");
+        System.out.println("\nGood Bye!");
     }
 
     /**
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java
index 750167af6..650e51802 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java
@@ -64,5 +64,6 @@ public class TryItEmulator implements Runnable {
                     //
             }
         }
+        System.exit(0);
     }
 }