diff --git a/bl-kernel/boot/rules/99.themes.php b/bl-kernel/boot/rules/99.themes.php
index 3b3b386c..16ad49a8 100644
--- a/bl-kernel/boot/rules/99.themes.php
+++ b/bl-kernel/boot/rules/99.themes.php
@@ -28,7 +28,7 @@ function buildThemes()
 			$database = file_get_contents($languageFilename);
 			$database = json_decode($database, true);
 			if(empty($database)) {
-				Log::set('99.themes.php'.LOG_SEP.'JSON Error on theme '.$themePath);
+				Log::set('99.themes.php'.LOG_SEP.'Language file error on theme '.$themePath);
 				break;
 			}
 
@@ -43,26 +43,20 @@ function buildThemes()
 			{
 				$metadataString = file_get_contents($filenameMetadata);
 				$metadata = json_decode($metadataString, true);
-				if(empty($metadata)) {
-					Log::set('99.themes.php'.LOG_SEP.'JSON Error on theme '.$themePath);
-					break;
+
+				if( !empty($metadata['compatible']) ) {
+
+					$explode = explode(',', $metadata['compatible']);
+
+					if(in_array(BLUDIT_VERSION, $explode)) {
+						$database = $database + $metadata;
+						array_push($themes, $database);
+					}
+				}
+				else {
+					Log::set('99.themes.php'.LOG_SEP.'Metadata file error on theme '.$themePath);
 				}
 
-				// Check if the theme is compatible
-				if(empty($metadata['compatible'])) {
-					Log::set('99.themes.php'.LOG_SEP.'Metadata error, field compatible invalid '.$themePath);
-					break;
-				}
-
-				$explode = explode(',', $metadata['compatible']);
-				if(!in_array(BLUDIT_VERSION, $explode)) {
-					Log::set('99.themes.php'.LOG_SEP.'Theme incompatible '.$themePath);
-					break;
-				}
-
-				// Theme data
-				$database = $database + $metadata;
-				array_push($themes, $database);
 			}
 		}
 	}