diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java
index aa28b59c..9fc694b8 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java
@@ -101,6 +101,12 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
 
             credentialProvider = new AndroidCredentialProvider(jsonSerializer, this, logger);
             ConnectionManager connectionManager = App.getConnectionManager(context, jsonSerializer, logger, httpClient);
+
+            if (server.getText().toString().trim().length() == 0) {
+                Toast.makeText(context, context.getResources().getString(R.string.error_login_empty_addr), Toast.LENGTH_SHORT).show();
+                return;
+            }
+
             connectionManager.Connect(server.getText().toString(), new Response<ConnectionResult>() {
                 @Override
                 public void onResponse(ConnectionResult result) {
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2f953143..d7392522 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -149,6 +149,8 @@
     <string name="sort_method_artist">Artiste</string>
     <string name="sort_method_album">Album</string>
     <string name="sort_method_year">Année</string>
+    <string name="error_login_empty_addr">Veuillez saisir l\'adresse du serveur.</string>
+    <string name="error_unexpected">Une erreur inattendue s\'est produite.</string>
     <string name="action_add_to_playlist">Ajouter à une playlist</string>
     <string name="action_add_to_queue">Ajouter à la liste de lecture</string>
     <string name="action_clear_queue">Vider la liste de lecture</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b6003113..f0ffd314 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -214,5 +214,7 @@
     <string name="cancel_current_timer">Cancel current timer</string>
     <string name="sleep_timer_canceled">Sleep timer canceled.</string>
     <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
+    <string name="error_login_empty_addr">Please fill in the server address.</string>
+    <string name="error_unexpected">An unexpected error occurred.</string>
 
 </resources>