Index: trunk/core/kernel/utility/http_query.php
===================================================================
diff -u -r3413 -r3425
--- trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 3413)
+++ trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 3425)
@@ -340,10 +340,9 @@
 			$this->Set('m_lang', $language_id);
 			$url_part = $url_parts ? array_shift($url_parts) : ''; // prepare next url part for parsing
 		}
-		else
-		{
-			$this->Application->VerifyLanguageId();
-		}
+		
+		$this->Application->VerifyLanguageId();
+		
 		$this->Application->Phrases->Init('phrases');
 		// $this->Get('m_lang') );
 		
@@ -357,10 +356,8 @@
 				$this->Set('m_theme', $theme_id);
 				$url_part = $url_parts ? array_shift($url_parts) : ''; // prepare next url part for parsing
 			}
-			else
-			{
-				$this->Application->VerifyThemeId();
-			}
+			
+			$this->Application->VerifyThemeId();
 		}
 		
 		// match category
@@ -452,7 +449,7 @@
 		}
 		
 		// guess template if no existing template found
-		if(!$template_found && $module_folder)
+		if(!$template_found && isset($module_folder) && $module_folder)
 		{
 			// 1. try index template of module
 			$sql = 'SELECT FileId FROM '.TABLE_PREFIX.'ThemeFiles WHERE CONCAT(FilePath, "/", FileName) = '.$this->Conn->qstr('/'.$module_folder.'/index.tpl');