diff --git a/source/draw.c b/source/draw.c
index 550b901..f2eb509 100644
--- a/source/draw.c
+++ b/source/draw.c
@@ -68,10 +68,6 @@ void exit_screens(void)
 static int theme_vertical_scroll = 0;
 static int splash_vertical_scroll = 0;
 
-void draw_themext_error(void)
-{
-    throw_error("Theme extdata does not exist\nSet a default theme from the home menu", ERROR);
-}
 
 void draw_base_interface(void)
 {
diff --git a/source/main.c b/source/main.c
index 34675b7..a5ab4c9 100644
--- a/source/main.c
+++ b/source/main.c
@@ -130,7 +130,7 @@ int main(void)
         
         if (R_FAILED(archive_result) && !splash_mode)
         {
-            draw_themext_error();
+			throw_error("Theme extdata does not exist\nSet a default theme from the home menu", ERROR);
             continue;
         }
         
@@ -250,7 +250,10 @@ int main(void)
                     draw_theme_install(SHUFFLE_INSTALL);
                     shuffle_install(themes_list, theme_count);
                     shuffle_theme_count = 0;
-                }
+				}
+				else {
+					throw_error("You dont have any Shuffle selected.", WARNING);
+				}
             }
         }