diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb
index ecf5f183..605af744 100644
Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb differ
diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo
index c33acaf5..e2fd060d 100644
Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditorTWL/MasterEditorTWL.suo differ
diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
index c47a85b5..2d769970 100644
Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ
diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp
index dae559c7..06668f45 100644
--- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp
+++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp
@@ -1302,6 +1302,25 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
 			"ROM Control Info.", "Mask ROM can be set. Please set One-time PROM.", false, true ) );
 	}
 
+	if( *this->hIsMediaNand == false )
+	{
+		if( (this->pRomHeader->s.enable_aes == 0) || (this->pRomHeader->s.aes_target_size == 0) )
+		{
+			this->hErrorList->Add( gcnew RCMrcError( 
+				"AES暗号", 0x60, 0x67, "AES暗号が無効になっています。セキュリティ上の問題があります。",
+				"AES Encryption", "AES Encryption is disable. It is a security problem.", false, true ) );
+		}
+	}
+	else		// NANDアプリ
+	{
+		if( (this->pRomHeader->s.enable_aes == 0) || (this->pRomHeader->s.aes_target_size == 0) || (this->pRomHeader->s.aes_target2_size == 0) )
+		{
+			this->hErrorList->Add( gcnew RCMrcError( 
+				"AES暗号", 0x60, 0x67, "AES暗号が無効になっています。セキュリティ上の問題があります。",
+				"AES Encryption", "AES Encryption is disable. It is a security problem.", false, true ) );
+		}
+	}
+
 	// 予約領域
 	System::Boolean bReserved = true;
 	for( i=0; i < 7; i++ )