diff --git a/application/libraries/OptionsLib.php b/application/libraries/OptionsLib.php
index 84535483c..d53d2aad3 100644
--- a/application/libraries/OptionsLib.php
+++ b/application/libraries/OptionsLib.php
@@ -131,7 +131,11 @@ class OptionsLib {
 
         $logo = $CI->Themes_model->get_logo_from_theme($theme, $logo_location);
 
-        return $logo;
+        if ($logo != null) {
+            return $logo;
+        } else {
+            return 'no_logo_found';
+        }
     }
 
 }
diff --git a/application/models/Themes_model.php b/application/models/Themes_model.php
index bfb8cb6f7..145bb37a9 100644
--- a/application/models/Themes_model.php
+++ b/application/models/Themes_model.php
@@ -64,6 +64,7 @@ class Themes_model extends CI_Model {
 	
 			return ($value !== null) ? (string) $value : null;
 		} else {
+			log_message('error', 'get_logo_from_theme failed');
 			return null;
 		}
 	}
diff --git a/assets/logo/no_logo_found.png b/assets/logo/no_logo_found.png
new file mode 100644
index 000000000..5964e31bf
Binary files /dev/null and b/assets/logo/no_logo_found.png differ