diff --git a/src/test/java/ch/eitchnet/utils/helper/AesCryptoHelperTest.java b/src/test/java/ch/eitchnet/utils/helper/AesCryptoHelperTest.java
index 797f79d86..f8207a12d 100644
--- a/src/test/java/ch/eitchnet/utils/helper/AesCryptoHelperTest.java
+++ b/src/test/java/ch/eitchnet/utils/helper/AesCryptoHelperTest.java
@@ -9,11 +9,16 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
 
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AesCryptoHelperTest {
 
+	private static final Logger logger = LoggerFactory.getLogger(AesCryptoHelperTest.class);
+
 	private static final char[] password = "A2589309-17AE-4819-B9E4-E577CFA7778F".toCharArray();
 	private static final byte[] salt;
 
@@ -28,92 +33,146 @@ public class AesCryptoHelperTest {
 	@Test
 	public void shouldWrapStreams() throws Exception {
 
-		byte[] clearTextBytes = "Some text".getBytes();
+		try {
+			byte[] clearTextBytes = "Some text".getBytes();
 
-		// encrypt data
-		ByteArrayOutputStream encryptedOut = new ByteArrayOutputStream();
-		OutputStream outputStream = AesCryptoHelper.wrapEncrypt(password, salt, encryptedOut);
-		outputStream.write(clearTextBytes);
-		outputStream.flush();
-		outputStream.close();
+			// encrypt data
+			ByteArrayOutputStream encryptedOut = new ByteArrayOutputStream();
+			OutputStream outputStream = AesCryptoHelper.wrapEncrypt(password, salt, encryptedOut);
+			outputStream.write(clearTextBytes);
+			outputStream.flush();
+			outputStream.close();
 
-		// decrypt data
-		byte[] encryptedBytes = encryptedOut.toByteArray();
-		ByteArrayInputStream encryptedIn = new ByteArrayInputStream(encryptedBytes);
-		InputStream inputStream = AesCryptoHelper.wrapDecrypt(password, salt, encryptedIn);
+			// decrypt data
+			byte[] encryptedBytes = encryptedOut.toByteArray();
+			ByteArrayInputStream encryptedIn = new ByteArrayInputStream(encryptedBytes);
+			InputStream inputStream = AesCryptoHelper.wrapDecrypt(password, salt, encryptedIn);
 
-		ByteArrayOutputStream decryptedOut = new ByteArrayOutputStream();
-		byte[] readBuffer = new byte[64];
-		int read = 0;
-		while ((read = inputStream.read(readBuffer)) != -1) {
-			decryptedOut.write(readBuffer, 0, read);
+			ByteArrayOutputStream decryptedOut = new ByteArrayOutputStream();
+			byte[] readBuffer = new byte[64];
+			int read = 0;
+			while ((read = inputStream.read(readBuffer)) != -1) {
+				decryptedOut.write(readBuffer, 0, read);
+			}
+
+			byte[] decryptedBytes = decryptedOut.toByteArray();
+
+			assertArrayEquals(clearTextBytes, decryptedBytes);
+		} catch (RuntimeException e) {
+			if (e.getCause() instanceof InvalidKeyException
+					&& e.getCause().getMessage().equals("Illegal key size or default parameters"))
+				logger.warn("YOU ARE MISSING THE UNLIMITED JCE POLICIES and can not do AES encryption!");
+			else
+				throw e;
 		}
-
-		byte[] decryptedBytes = decryptedOut.toByteArray();
-
-		assertArrayEquals(clearTextBytes, decryptedBytes);
 	}
 
 	@Test
 	public void shouldEncryptBytes() {
+		try {
 
-		byte[] clearTextBytes = "Some text".getBytes();
+			byte[] clearTextBytes = "Some text".getBytes();
 
-		byte[] encryptedBytes = AesCryptoHelper.encrypt(password, salt, clearTextBytes);
-		byte[] decryptedBytes = AesCryptoHelper.decrypt(password, salt, encryptedBytes);
+			byte[] encryptedBytes = AesCryptoHelper.encrypt(password, salt, clearTextBytes);
+			byte[] decryptedBytes = AesCryptoHelper.decrypt(password, salt, encryptedBytes);
 
-		assertArrayEquals(clearTextBytes, decryptedBytes);
+			assertArrayEquals(clearTextBytes, decryptedBytes);
+		} catch (RuntimeException e) {
+			if (e.getCause() instanceof InvalidKeyException
+					&& e.getCause().getMessage().equals("Illegal key size or default parameters"))
+				logger.warn("YOU ARE MISSING THE UNLIMITED JCE POLICIES and can not do AES encryption!");
+			else
+				throw e;
+		}
 	}
 
 	@Test
 	public void shouldEncryptShortFile() {
-		// file to be encrypted
-		String clearTextFileS = "src/test/resources/crypto_test_short.txt";
-		// encrypted file
-		String encryptedFileS = "target/encrypted_short.aes";
-		// encrypted file
-		String decryptedFileS = "target/decrypted_short.txt";
+		try {
 
-		testCrypto(clearTextFileS, encryptedFileS, decryptedFileS);
+			// file to be encrypted
+			String clearTextFileS = "src/test/resources/crypto_test_short.txt";
+			// encrypted file
+			String encryptedFileS = "target/encrypted_short.aes";
+			// encrypted file
+			String decryptedFileS = "target/decrypted_short.txt";
+
+			testCrypto(clearTextFileS, encryptedFileS, decryptedFileS);
+
+		} catch (RuntimeException e) {
+			if (e.getCause() instanceof InvalidKeyException
+					&& e.getCause().getMessage().equals("Illegal key size or default parameters"))
+				logger.warn("YOU ARE MISSING THE UNLIMITED JCE POLICIES and can not do AES encryption!");
+			else
+				throw e;
+		}
 	}
 
 	@Test
 	public void shouldEncryptMiddleFile() {
+		try {
 
-		// file to be encrypted
-		String clearTextFileS = "src/test/resources/crypto_test_middle.txt";
-		// encrypted file
-		String encryptedFileS = "target/encrypted_middle.aes";
-		// encrypted file
-		String decryptedFileS = "target/decrypted_middle.txt";
+			// file to be encrypted
+			String clearTextFileS = "src/test/resources/crypto_test_middle.txt";
+			// encrypted file
+			String encryptedFileS = "target/encrypted_middle.aes";
+			// encrypted file
+			String decryptedFileS = "target/decrypted_middle.txt";
 
-		testCrypto(clearTextFileS, encryptedFileS, decryptedFileS);
+			testCrypto(clearTextFileS, encryptedFileS, decryptedFileS);
+
+		} catch (RuntimeException e) {
+			if (e.getCause() instanceof InvalidKeyException
+					&& e.getCause().getMessage().equals("Illegal key size or default parameters"))
+				logger.warn("YOU ARE MISSING THE UNLIMITED JCE POLICIES and can not do AES encryption!");
+			else
+				throw e;
+		}
 	}
 
 	@Test
 	public void shouldEncryptLongFile() {
+		try {
 
-		// file to be encrypted
-		String clearTextFileS = "src/test/resources/crypto_test_long.txt";
-		// encrypted file
-		String encryptedFileS = "target/encrypted_long.aes";
-		// encrypted file
-		String decryptedFileS = "target/decrypted_long.txt";
+			// file to be encrypted
+			String clearTextFileS = "src/test/resources/crypto_test_long.txt";
+			// encrypted file
+			String encryptedFileS = "target/encrypted_long.aes";
+			// encrypted file
+			String decryptedFileS = "target/decrypted_long.txt";
 
-		testCrypto(clearTextFileS, encryptedFileS, decryptedFileS);
+			testCrypto(clearTextFileS, encryptedFileS, decryptedFileS);
+
+		} catch (RuntimeException e) {
+			if (e.getCause() instanceof InvalidKeyException
+					&& e.getCause().getMessage().equals("Illegal key size or default parameters"))
+				logger.warn("YOU ARE MISSING THE UNLIMITED JCE POLICIES and can not do AES encryption!");
+			else
+				throw e;
+		}
 	}
 
 	@Test
 	public void shouldEncryptBinaryFile() {
 
-		// file to be encrypted
-		String clearTextFileS = "src/test/resources/crypto_test_image.ico";
-		// encrypted file
-		String encryptedFileS = "target/encrypted_image.aes";
-		// encrypted file
-		String decryptedFileS = "target/decrypted_image.ico";
+		try {
 
-		testCrypto(clearTextFileS, encryptedFileS, decryptedFileS);
+			// file to be encrypted
+			String clearTextFileS = "src/test/resources/crypto_test_image.ico";
+			// encrypted file
+			String encryptedFileS = "target/encrypted_image.aes";
+			// encrypted file
+			String decryptedFileS = "target/decrypted_image.ico";
+
+			testCrypto(clearTextFileS, encryptedFileS, decryptedFileS);
+
+		} catch (RuntimeException e) {
+			if (e.getCause() instanceof InvalidKeyException
+					&& e.getCause().getMessage().equals("Illegal key size or default parameters"))
+				logger.warn("YOU ARE MISSING THE UNLIMITED JCE POLICIES and can not do AES encryption!");
+			else
+				throw e;
+		}
 	}
 
 	private static void testCrypto(String clearTextFileS, String encryptedFileS, String decryptedFileS) {