diff --git a/utils/src/main/java/li/strolch/utils/dbc/DBC.java b/utils/src/main/java/li/strolch/utils/dbc/DBC.java
index c4d62192f..5b0a68c71 100644
--- a/utils/src/main/java/li/strolch/utils/dbc/DBC.java
+++ b/utils/src/main/java/li/strolch/utils/dbc/DBC.java
@@ -19,6 +19,7 @@ import java.io.File;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.function.Supplier;
 
 import li.strolch.utils.helper.StringHelper;
 
@@ -38,6 +39,10 @@ public enum DBC {
 	}
 
 	public <T> void assertEquals(String msg, T value1, T value2) {
+		assertEquals(() -> msg, value1, value2);
+	}
+
+	public <T> void assertEquals(Supplier<String> msgSupplier, T value1, T value2) {
 		if (value1 == null && value2 == null)
 			return;
 
@@ -48,11 +53,16 @@ public enum DBC {
 			return;
 
 		String ex = "{0}: {1} != {2}";
-		ex = MessageFormat.format(ex, msg, value1, value2);
+		ex = MessageFormat.format(ex, msgSupplier.get(), value1, value2);
 		throw new DbcException(ex);
 	}
 
 	public <T> void assertEqualsIgnoreOrdering(String msg, Collection<T> value1, Collection<T> value2) {
+		assertEqualsIgnoreOrdering(() -> msg, value1, value2);
+	}
+
+	public <T> void assertEqualsIgnoreOrdering(Supplier<String> msgSupplier, Collection<T> value1,
+			Collection<T> value2) {
 		if (value1 == null && value2 == null)
 			return;
 
@@ -60,11 +70,15 @@ public enum DBC {
 			return;
 
 		String ex = "{0}: {1} != {2}";
-		ex = MessageFormat.format(ex, msg, value1, value2);
+		ex = MessageFormat.format(ex, msgSupplier.get(), value1, value2);
 		throw new DbcException(ex);
 	}
 
 	public <T> void assertNotEquals(String msg, T value1, T value2) {
+		assertNotEquals(() -> msg, value1, value2);
+	}
+
+	public <T> void assertNotEquals(Supplier<String> msgSupplier, T value1, T value2) {
 		if (value1 != null && !value1.equals(value2))
 			return;
 
@@ -72,107 +86,153 @@ public enum DBC {
 			return;
 
 		String ex = "{0}: {1} == {2}";
-		ex = MessageFormat.format(ex, msg, value1, value2);
+		ex = MessageFormat.format(ex, msgSupplier.get(), value1, value2);
 		throw new DbcException(ex);
 	}
 
 	public void assertTrue(String msg, boolean value) {
+		assertTrue(() -> msg, value);
+	}
+
+	public void assertTrue(Supplier<String> msgSupplier, boolean value) {
 		if (!value) {
 			String ex = "Expected true, but was false: {0}";
-			ex = MessageFormat.format(ex, msg);
+			ex = MessageFormat.format(ex, msgSupplier.get());
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertFalse(String msg, boolean value) {
+		assertFalse(() -> msg, value);
+	}
+
+	public void assertFalse(Supplier<String> msgSupplier, boolean value) {
 		if (value) {
 			String ex = "Expected false, but was true: {0}";
-			ex = MessageFormat.format(ex, msg);
+			ex = MessageFormat.format(ex, msgSupplier.get());
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertEmpty(String msg, String value) {
+		assertEmpty(() -> msg, value);
+	}
+
+	public void assertEmpty(Supplier<String> msgSupplier, String value) {
 		if (!StringHelper.isEmpty(value)) {
 			String ex = "{0}: Illegal non-empty value: {1}";
-			ex = MessageFormat.format(ex, msg, value);
+			ex = MessageFormat.format(ex, msgSupplier.get(), value);
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertEmpty(String msg, Object[] array) {
-		assertNotNull(msg, array);
+		assertEmpty(() -> msg, array);
+	}
+
+	public void assertEmpty(Supplier<String> msgSupplier, Object[] array) {
+		assertNotNull(msgSupplier, array);
 		if (array.length != 0) {
 			String ex = "{0}: Illegal non-empty value: {1}";
-			ex = MessageFormat.format(ex, msg, Arrays.toString(array));
+			ex = MessageFormat.format(ex, msgSupplier.get(), Arrays.toString(array));
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertEmpty(String msg, Collection<?> collection) {
-		assertNotNull(msg, collection);
+		assertEmpty(() -> msg, collection);
+	}
+
+	public void assertEmpty(Supplier<String> msgSupplier, Collection<?> collection) {
+		assertNotNull(msgSupplier, collection);
 		if (!collection.isEmpty()) {
 			String ex = "{0}: Illegal non-empty value: {1}";
-			ex = MessageFormat.format(ex, msg, collection.toString());
+			ex = MessageFormat.format(ex, msgSupplier.get(), collection.toString());
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertNotEmpty(String msg, String value) {
+		assertNotEmpty(() -> msg, value);
+	}
+
+	public void assertNotEmpty(Supplier<String> msgSupplier, String value) {
 		if (StringHelper.isEmpty(value)) {
 			String ex = "{0}: Illegal empty value";
-			ex = MessageFormat.format(ex, msg);
+			ex = MessageFormat.format(ex, msgSupplier.get());
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertNotEmpty(String msg, Object[] array) {
-		assertNotNull(msg, array);
+		assertNotEmpty(() -> msg, array);
+	}
+
+	public void assertNotEmpty(Supplier<String> msgSupplier, Object[] array) {
+		assertNotNull(msgSupplier, array);
 		if (array.length == 0) {
 			String ex = "{0}: Illegal empty value";
-			ex = MessageFormat.format(ex, msg);
+			ex = MessageFormat.format(ex, msgSupplier.get());
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertNotEmpty(String msg, Collection<?> collection) {
-		assertNotNull(msg, collection);
+		assertNotEmpty(() -> msg, collection);
+	}
+
+	public void assertNotEmpty(Supplier<String> msgSupplier, Collection<?> collection) {
+		assertNotNull(msgSupplier, collection);
 		if (collection.isEmpty()) {
 			String ex = "{0}: Illegal empty value";
-			ex = MessageFormat.format(ex, msg);
+			ex = MessageFormat.format(ex, msgSupplier.get());
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertNotNull(String msg, Object value) {
+		assertNotNull(() -> msg, value);
+	}
+
+	public void assertNotNull(Supplier<String> msgSupplier, Object value) {
 		if (value == null) {
 			String ex = "{0}: Illegal null value";
-			ex = MessageFormat.format(ex, msg);
+			ex = MessageFormat.format(ex, msgSupplier.get());
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertNull(String msg, Object value) {
+		assertNull(() -> msg, value);
+	}
+
+	public void assertNull(Supplier<String> msgSupplier, Object value) {
 		if (value != null) {
 			String ex = "{0}: {1} != null";
-			ex = MessageFormat.format(ex, msg, value);
+			ex = MessageFormat.format(ex, msgSupplier.get(), value);
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertNotExists(String msg, File file) {
+		assertNotExists(() -> msg, file);
+	}
+
+	public void assertNotExists(Supplier<String> msgSupplier, File file) {
 		if (file.exists()) {
-			String ex = MessageFormat.format("Illegal situation as file ({0}) exists: {1}", file, msg);
-			ex = MessageFormat.format(ex, msg);
+			String ex = MessageFormat.format("Illegal situation as file ({0}) exists: {1}", file, msgSupplier.get());
 			throw new DbcException(ex);
 		}
 	}
 
 	public void assertExists(String msg, File file) {
+		assertExists(() -> msg, file);
+	}
+
+	public void assertExists(Supplier<String> msgSupplier, File file) {
 		if (!file.exists()) {
-			String ex = MessageFormat
-					.format("Illegal situation as file ({0}) does not exist: {1}", file, msg);
-			ex = MessageFormat.format(ex, msg);
+			String ex = MessageFormat.format("Illegal situation as file ({0}) does not exist: {1}", file,
+					msgSupplier.get());
 			throw new DbcException(ex);
 		}
 	}