diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java
index 3bf2f1e08..d12b95368 100644
--- a/src/main/java/eu/siacs/conversations/utils/Resolver.java
+++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java
@@ -311,7 +311,7 @@ public class Resolver {
 
 		public ContentValues toContentValues() {
 			final ContentValues contentValues = new ContentValues();
-			contentValues.put(IP, ip.getAddress());
+			contentValues.put(IP, ip == null ? null : ip.getAddress());
 			contentValues.put(HOSTNAME, hostname.toString());
 			contentValues.put(PORT, port);
 			contentValues.put(PRIORITY, priority);