diff --git a/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java b/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java
index f989c0c25..a15abe14a 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java
@@ -176,7 +176,7 @@ public final class Jid {
 			return resourcepart.isEmpty() ? this : fromParts(localpart, domainpart, "");
 		} catch (final InvalidJidException e) {
 			// This should never happen.
-			return null;
+			throw new AssertionError("Jid " + this.toString() + " invalid");
 		}
 	}
 
@@ -185,7 +185,7 @@ public final class Jid {
 			return resourcepart.isEmpty() && localpart.isEmpty() ? this : fromString(getDomainpart());
 		} catch (final InvalidJidException e) {
 			// This should never happen.
-			return null;
+			throw new AssertionError("Jid " + this.toString() + " invalid");
 		}
 	}