diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp
index 9bbb876..0ce5c86 100644
--- a/src/aocharmovie.cpp
+++ b/src/aocharmovie.cpp
@@ -50,6 +50,9 @@ void AOCharMovie::load_image(QString p_char, QString p_emote, QString emote_pref
   movie_delays.clear();
   movie_effects.clear();
 
+  if (!file_exists(emote_path))
+    return;
+
   m_reader->setFileName(emote_path);
   QPixmap f_pixmap = this->get_pixmap(m_reader->read());
   int f_delay = m_reader->nextImageDelay();
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 783c83b..2c9d5e9 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -527,7 +527,7 @@ QString AOApplication::get_sfx(QString p_identifier)
 
 QString AOApplication::get_sfx_suffix(QString sound_to_check)
 {
-    if (sound_to_check.contains(".")) //We have what we could call a file extension
+    if (file_exists(sound_to_check))
         return sound_to_check;
     if (file_exists(sound_to_check + ".opus"))
         return sound_to_check + ".opus";
@@ -542,7 +542,7 @@ QString AOApplication::get_sfx_suffix(QString sound_to_check)
 
 QString AOApplication::get_image_suffix(QString path_to_check)
 {
-    if (path_to_check.contains(".")) //We have what we could call a file extension
+    if (file_exists(path_to_check))
         return path_to_check;
     if (file_exists(path_to_check + ".webp"))
         return path_to_check + ".webp";