diff --git a/tizenbrew-app/TizenBrew/config.xml b/tizenbrew-app/TizenBrew/config.xml
index ab5785c..928d99e 100644
--- a/tizenbrew-app/TizenBrew/config.xml
+++ b/tizenbrew-app/TizenBrew/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns:tizen="http://tizen.org/ns/widgets" xmlns="http://www.w3.org/ns/widgets" id="https://tizentube.vercel.app" version="1.4.4" viewmodes="maximized">
+<widget xmlns:tizen="http://tizen.org/ns/widgets" xmlns="http://www.w3.org/ns/widgets" id="https://tizentube.vercel.app" version="1.4.5" viewmodes="maximized">
     <access origin="*" subdomains="true"></access>
     <tizen:app-control>
         <tizen:src name="index.html" reload="disable"/>
diff --git a/tizenbrew-app/TizenBrew/js/wsClient.js b/tizenbrew-app/TizenBrew/js/wsClient.js
index 1ae156c..5a2def6 100644
--- a/tizenbrew-app/TizenBrew/js/wsClient.js
+++ b/tizenbrew-app/TizenBrew/js/wsClient.js
@@ -111,7 +111,7 @@ function onMessage(msg) {
                 const moduleName = message.appControlData.module.name;
                 const moduleType = message.appControlData.module.moduleType;
                 const keys = message.appControlData.module.keys;
-                const appPath = message.appControlData.module.appPath;
+                let appPath = message.appControlData.module.appPath;
                 const tizenAppId = message.appControlData.module.tizenAppId;
                 const args = message.appControlData.args;
 
@@ -124,7 +124,11 @@ function onMessage(msg) {
                 setTimeout(() => {
                     send({ type: 'launch', package: `${moduleType}/${moduleName}`, tvIp: webapis.network.getIp(), isTizen3 });
                     if (!tizenAppId) {
-                        location.href = `${appPath}${args ? `?${args}` : ''}`;
+                        if (appPath.includes('?') && args) {
+                            appPath += `&${args}`;
+                        }
+
+                        location.href = appPath;
                     }
                 }, 250);
                 return;
diff --git a/tizenbrew-updater/TizenBrewUpdater/config.xml b/tizenbrew-updater/TizenBrewUpdater/config.xml
index a11643c..423019b 100644
--- a/tizenbrew-updater/TizenBrewUpdater/config.xml
+++ b/tizenbrew-updater/TizenBrewUpdater/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns:tizen="http://tizen.org/ns/widgets" xmlns="http://www.w3.org/ns/widgets" id="https://tizentube.vercel.app"
-   version="1.0.2" viewmodes="maximized">
+   version="1.0.3" viewmodes="maximized">
    <access origin="*" subdomains="true" />
    <tizen:app-control>
       <tizen:src name='index.html' reload='disable'></tizen:src>
diff --git a/tizenbrew-updater/TizenBrewUpdater/service/service.js b/tizenbrew-updater/TizenBrewUpdater/service/service.js
index 7badd34..d9c7f2b 100644
--- a/tizenbrew-updater/TizenBrewUpdater/service/service.js
+++ b/tizenbrew-updater/TizenBrewUpdater/service/service.js
@@ -37,18 +37,31 @@ module.exports.onStart = function () {
         }
 
         adb = adbhost.createConnection({ host: ip, port: 26101 });
+        
+        let connected = false;
+        const waitTimeout = setTimeout(() => {
+            if (connected) global.currentClient.send(JSON.stringify({ type: 'connectedToDaemon' }));
+        }, 1000);
 
         adb._stream.on('connect', () => {
             console.log('ADB connection established');
-            global.currentClient.send(JSON.stringify({ type: 'connectedToDaemon' }));
+            connected = true;
         });
 
         adb._stream.on('error', (e) => {
             console.log('ADB connection error. ' + e);
+            clearTimeout(waitTimeout);
+
+            if (e.code === 'ECONNREFUSED') {
+                global.currentClient.send(JSON.stringify({ type: 'error', message: 'Could not connect to daemon. Make sure the TV is on and the IP is correct.' }));
+            } else if (e.code === 'ECONNRESET') {
+                global.currentClient.send(JSON.stringify({ type: 'error', message: 'Connection reset. Either your TVs Host PC IP wasn\'t set to this devices IP or it was not rebooted properly. Reboot by holding the power button till you see the Samsung logo or the bouncing house.' }));
+            }
         });
 
         adb._stream.on('close', () => {
             console.log('ADB connection closed.');
+            clearTimeout(waitTimeout);
         });
 
     }