diff --git a/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage4.java b/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage4.java
index 72cdaf8..9005583 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage4.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Welcome/WelcomePage4.java
@@ -65,14 +65,13 @@ private void checkConnectionData() {
                 @Override
                 public void onReceiveVersion(String version) {
                     tempText = getString(R.string.welcome_msg_serverVersion) + ": " + version;
-                    setSuccessText(tempText);
 
                     mDomoticz.getDevices(new DevicesReceiver() {
                         @Override
                         public void onReceiveDevices(ArrayList<DevicesInfo> mDevicesInfo) {
-                            tempText = tempText + "\n";
+                            tempText += "\n";
                             String formatted = String.format(getString(R.string.welcome_msg_numberOfDevices), mDevicesInfo.size());
-                            tempText = tempText + formatted;
+                            tempText += formatted;
                             setSuccessText(tempText);
                         }
 
@@ -82,6 +81,7 @@ public void onReceiveDevice(DevicesInfo mDevicesInfo) {
 
                         @Override
                         public void onError(Exception error) {
+                            setSuccessText(tempText);//no devices found
                         }
                     }, 0, null);
                 }