diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 2c612b051..6fb3232a5 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1072,6 +1072,7 @@ class Context
 	 */
 	function convertEncodingStr($str)
 	{
+        if(!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 99d7292f8..85bf05646 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -59,7 +59,10 @@ class ModuleHandler extends Handler
 		$this->mid = $mid ? $mid : Context::get('mid');
 		$this->document_srl = $document_srl ? (int) $document_srl : (int) Context::get('document_srl');
 		$this->module_srl = $module_srl ? (int) $module_srl : (int) Context::get('module_srl');
-		$this->entry = Context::convertEncodingStr(Context::get('entry'));
+        if($entry = Context::get('entry'))
+        {
+            $this->entry = Context::convertEncodingStr($entry);
+        }
 
 		// Validate variables to prevent XSS
 		$isInvalid = NULL;