diff --git a/modules/theme_select/module.php b/modules/theme_select/module.php
index <HASH>..<HASH> 100644
--- a/modules/theme_select/module.php
+++ b/modules/theme_select/module.php
@@ -49,12 +49,17 @@ class theme_select_WT_Module extends WT_Module implements WT_Module_Block {
 
 		$id=$this->getName().$block_id;
 		$title=i18n::translate('Change theme').help_link('change_theme');
-		$content='<br /><div class="center theme_form">'.MenuBar::getThemeMenu()->getMenuAsDropdown().'</div><br />';
+		$menu=MenuBar::getThemeMenu();
+		if ($menu) {
+			$content='<br /><div class="center theme_form">'.MenuBar::getThemeMenu()->getMenuAsDropdown().'</div><br />';
 
-		if ($template) {
-			require $THEME_DIR.'templates/block_main_temp.php';
+			if ($template) {
+				require $THEME_DIR.'templates/block_main_temp.php';
+			} else {
+				return $content;
+			}
 		} else {
-			return $content;
+			return '';
 		}
 	}
Fix: theme-select block crashes when there is no menu to display