diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0f21aad
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_5_API_29.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-02-15T07:23:10.782369Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
index 0a6dfd8..714219b 100644
--- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
+++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
@@ -336,11 +336,11 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
 
         public void updateView(Geofavorite item) {
             binding.collapsingToolbar.setTitle(item.getName() != null ? item.getName() : getString(R.string.new_geobookmark));
-            binding.nameEt.setText(item.getName());
-            binding.descriptionEt.setText(item.getComment());
+            binding.nameEt.setText(item.getName() != null ? item.getName() : "");
+            binding.descriptionEt.setText(item.getComment() != null ? item.getComment() : "");
             binding.createdTv.setText(item.getLocalDateCreated().format(dateFormatter));
             binding.modifiedTv.setText(item.getLocalDateCreated().format(dateFormatter));
-            binding.categoryAt.setText(item.getCategory());
+            binding.categoryAt.setText(item.getCategory() != null ? item.getCategory() : Geofavorite.DEFAULT_CATEGORY);
             updateViewCoords(item);
         }
 
diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java
index a902d1a..41eb4e5 100644
--- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java
+++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java
@@ -345,7 +345,7 @@ public class MainActivity extends NextcloudMapsStyledActivity implements OnSorti
 
     private void showGeofavoriteDeteleDialog(Geofavorite item) {
         AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-        builder.setMessage(getString(R.string.dialog_delete_message).replace("{name}", item.getName()))
+        builder.setMessage(getString(R.string.dialog_delete_message).replace("{name}", item.getName() != null ? item.getName() : ""))
                 .setTitle(R.string.dialog_delete_title)
                 .setPositiveButton(R.string.dialog_delete_delete, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/repository/GeofavoriteRepository.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/repository/GeofavoriteRepository.java
index ba11ae4..9d5e42e 100644
--- a/app/src/main/java/it/danieleverducci/nextcloudmaps/repository/GeofavoriteRepository.java
+++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/repository/GeofavoriteRepository.java
@@ -162,7 +162,9 @@ public class GeofavoriteRepository {
     private void updateCategories(List<Geofavorite> geofavs) {
         HashSet<String> categories = new HashSet<>();
         for (Geofavorite g : geofavs) {
-            categories.add(g.getCategory());
+            String cat = g.getCategory();
+            if (cat != null)
+                categories.add(cat);
         }
         mCategories.postValue(categories);
     }