diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.java
--- a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.java
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.java
@@ -520,7 +520,7 @@
      */
     private void updateMessage(){
         String message = null;
-        if (stopName != null && stopID != null && stopName.length() > 0) {
+        if (stopName != null && stopID != null && !stopName.isEmpty()) {
             message = (stopID.concat(" - ").concat(stopName));
         } else if(stopID!=null) {
             message = stopID;
@@ -572,7 +572,8 @@
                     data.moveToFirst();
                     final String probableName = data.getString(colUserName);
                     stopIsInFavorites = true;
-                    stopName = probableName;
+                    if (probableName != null && !probableName.isEmpty())
+                        stopName = probableName; //set the stop
                     //update the message in the textview
                     updateMessage();