diff --git a/datatest.cpp b/datatest.cpp
index cd431750..79609e88 100644
--- a/datatest.cpp
+++ b/datatest.cpp
@@ -409,6 +409,8 @@ void OutputNameValuePairs(const NameValuePairs &v)
 void TestDataFile(const std::string &filename, unsigned int &totalTests, unsigned int &failedTests)
 {
 	std::ifstream file(filename.c_str());
+	if (!file.good())
+		throw Exception(Exception::OTHER_ERROR, "Can not open file " + filename + " for reading");
 	TestData v;
 	s_currentTestData = &v;
 	std::string name, value, lastAlgName;
diff --git a/regtest.cpp b/regtest.cpp
index b6cd3d9b..05ff75e5 100644
--- a/regtest.cpp
+++ b/regtest.cpp
@@ -18,6 +18,7 @@
 #include "tea.h"
 #include "panama.h"
 #include "pssr.h"
+#include "aes.h"
 
 USING_NAMESPACE(CryptoPP)
 
@@ -63,6 +64,11 @@ void RegisterFactories()
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<XTEA> >();
 	RegisterSymmetricCipherDefaultFactories<PanamaCipher<LittleEndian> >();
 	RegisterSymmetricCipherDefaultFactories<PanamaCipher<BigEndian> >();
+	RegisterSymmetricCipherDefaultFactories<ECB_Mode<AES> >();
+	RegisterSymmetricCipherDefaultFactories<CBC_Mode<AES> >();
+	RegisterSymmetricCipherDefaultFactories<CFB_Mode<AES> >();
+	RegisterSymmetricCipherDefaultFactories<OFB_Mode<AES> >();
+	RegisterSymmetricCipherDefaultFactories<CTR_Mode<AES> >();
 
 	s_registered = true;
 }