diff --git a/app/src/main/java/awais/instagrabber/adapters/FeedAdapter.java b/app/src/main/java/awais/instagrabber/adapters/FeedAdapter.java
index 7ed66356..09623f3f 100755
--- a/app/src/main/java/awais/instagrabber/adapters/FeedAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/FeedAdapter.java
@@ -68,8 +68,8 @@ public final class FeedAdapter extends ListAdapter<FeedModel, FeedItemViewHolder
                 final ItemFeedSliderBinding binding = ItemFeedSliderBinding.inflate(layoutInflater, parent, false);
                 return new FeedSliderViewHolder(binding, mentionClickListener, clickListener, longClickListener);
             }
-            default:
-            case MEDIA_TYPE_IMAGE: {
+            case MEDIA_TYPE_IMAGE:
+            default: {
                 final ItemFeedPhotoBinding binding = ItemFeedPhotoBinding.inflate(layoutInflater, parent, false);
                 return new FeedPhotoViewHolder(binding, mentionClickListener, clickListener, longClickListener);
             }
diff --git a/app/src/main/java/awais/instagrabber/customviews/RamboTextView.java b/app/src/main/java/awais/instagrabber/customviews/RamboTextView.java
index 166a8b39..388fee52 100755
--- a/app/src/main/java/awais/instagrabber/customviews/RamboTextView.java
+++ b/app/src/main/java/awais/instagrabber/customviews/RamboTextView.java
@@ -40,7 +40,7 @@ public final class RamboTextView extends AppCompatTextView {
 
     private final Handler handler = new Handler();
     private final Runnable longPressRunnable = () -> {
-        longClickListener.onLongClick(this);
+        if (longClickListener != null) longClickListener.onLongClick(this);
     };
 
     public RamboTextView(final Context context) {
diff --git a/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java
index 9af8c42f..68dde31e 100644
--- a/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java
@@ -106,7 +106,7 @@ public final class SavedViewerFragment extends Fragment implements SwipeRefreshL
         @Override
         public void onResult(final PostModel[] result) {
             final List<PostModel> current = postsViewModel.getList().getValue();
-            if (result != null) {
+            if (result != null && result.length > 0) {
                 final List<PostModel> resultList = Arrays.asList(result);
                 if (current == null) {
                     postsViewModel.getList().postValue(resultList);