diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php
index cd9d3bb03..5f0c1fceb 100644
--- a/classes/optimizer/Optimizer.class.php
+++ b/classes/optimizer/Optimizer.class.php
@@ -26,7 +26,7 @@
          * @brief 파일 목록 배열에서 optimized 첨자를 제거한 후 return
         **/
         function _getOptimizedRemoved($files) {
-            foreach($files as $key => &$val) unset($key['optimized']);
+            foreach($files as $key => $val) unset($files[$key]['optimized']);
             return $files;
         }
 
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index 05aca8bf1..c4c81f7cc 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -259,10 +259,12 @@
             $base_path = $this->tpl_path;
             $given_file = trim($matches[1]);
             if(!$given_file) return;
-			$optimized = strtolower(trim(@$matches[3]));
-			if(!$optimized) $optimized = 'true';
-			$media = trim(@$matches[5]);
-			if(!$media) $media = 'all';
+            if(isset($matches[3]))
+                $optimized = strtolower(trim($matches[3]));
+            if(!$optimized) $optimized = 'true';
+            if(isset($matches[5]))
+                $media = trim($matches[5]);
+            if(!$media) $media = 'all';
 
             // given_file이 lang으로 끝나게 되면 언어팩을 읽도록 함
             if(substr($given_file, -4)=='lang') {