diff --git a/res/layout/stop_line_element.xml b/res/layout/stop_line_element.xml
--- a/res/layout/stop_line_element.xml
+++ b/res/layout/stop_line_element.xml
@@ -39,7 +39,8 @@
             app:layout_constraintStart_toStartOf="@id/busStopID"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginLeft="26dp"
-            android:layout_marginStart="26dp"/>
+            android:layout_marginStart="26dp"
+            />
 
     <TextView
             android:id="@+id/busStopName"
@@ -54,7 +55,7 @@
             app:layout_constraintTop_toTopOf="@id/busStopID"
             android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="0dp"
+            android:layout_marginTop="3dp"
             android:layout_marginEnd="10dp"
 
             android:layout_marginRight="10dp"
diff --git a/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java b/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
--- a/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
+++ b/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
@@ -28,6 +28,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
+import java.util.Locale;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.Stop;
@@ -195,7 +196,7 @@
             }
         }
 
-        if (stop.location == null) {
+        if (stop.location == null || stop.location.toLowerCase(Locale.ROOT).equals("null")) {
             vh.busStopLocaLityTextView.setVisibility(View.GONE);
         } else {
             vh.busStopLocaLityTextView.setText(NameCapitalize.capitalizePass(stop.location, capitalizeLocation));