diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index f7a0e2109b51b7707eccc844c4dc1045e337af69..ab1319ef842420716de37edbb342c76d2c6eb45c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -365,7 +365,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					break;
 				case Message.ENCRYPTION_AXOLOTL:
 					AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
-					if (axolotlService.trustedSessionVerified(conversation)) {
+					if (axolotlService != null && axolotlService.trustedSessionVerified(conversation)) {
 						mEditMessage.setHint(getString(R.string.send_omemo_x509_message));
 					} else {
 						mEditMessage.setHint(getString(R.string.send_omemo_message));
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
index f3c4f79a2a66858829cd844dbf81bdcffa47148c..e07df627ed4cd301cd6cb0d89494b1ee42a7bfbb 100644
--- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
@@ -227,10 +227,11 @@ public class DNSHelper {
 	}
 
 	public static boolean isIp(final String server) {
-		return PATTERN_IPV4.matcher(server).matches()
+		return server != null && (
+				PATTERN_IPV4.matcher(server).matches()
 				|| PATTERN_IPV6.matcher(server).matches()
 				|| PATTERN_IPV6_6HEX4DEC.matcher(server).matches()
 				|| PATTERN_IPV6_HEX4DECCOMPRESSED.matcher(server).matches()
-				|| PATTERN_IPV6_HEXCOMPRESSED.matcher(server).matches();
+				|| PATTERN_IPV6_HEXCOMPRESSED.matcher(server).matches());
 	}
 }