2 files changed, 24 insertions, 3 deletions
diff --git a/loader.c b/loader.c
index 99d2838..3615908 100644
--- a/loader.c
+++ b/loader.c
@@ -11,6 +11,9 @@ SDL_Texture* imv_load_image(SDL_Renderer *r, const char* path)
 
   const char* ext = strrchr(path, '.');
 
+  if(!ext)
+    return NULL;
+
   if(strcasecmp(ext, ".png") == 0) {
     return imv_load_png(r, path);
   } else if(strcasecmp(ext, ".jpeg") == 0 || strcasecmp(ext, ".jpg") == 0) {
diff --git a/main.c b/main.c
index e6da41a..2c8a09e 100644
--- a/main.c
+++ b/main.c
@@ -63,7 +63,20 @@ void add_path(const char* path)
     new_path->next = g_path.first;
     g_path.last= new_path;
   }
+}
 
+void remove_current_path()
+{
+  if(g_path.cur->next == g_path.cur) {
+    fprintf(stderr, "All input paths removed. Exiting\n");
+    exit(0);
+  }
+
+  struct loop_item_s* cur = g_path.cur;
+  cur->next->prev = cur->prev;
+  cur->prev->next = cur->next;
+  g_path.cur = cur->next;
+  free(cur);
 }
 
 void next_path()
@@ -172,13 +185,18 @@ int main(int argc, char** argv)
     if(g_path.reload) {
       if(img) {
         SDL_DestroyTexture(img);
+        img = NULL;
       }
       img = imv_load_image(renderer, g_path.cur->path);
-      g_path.reload = 0;
-      reset_view();
+      if(img == NULL) {
+        remove_current_path();
+      } else {
+        g_path.reload = 0;
+        reset_view();
+      }
     }
 
-    if(g_view.redraw) {
+    if(g_view.redraw && img) {
       SDL_RenderClear(renderer);
 
       if(img) {