diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index f1d6837d5..c541f971f 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -94,13 +94,6 @@ public class MessageGenerator extends AbstractGenerator {
 		return packet;
 	}
 
-	public static void addMessageHints(MessagePacket packet) {
-		packet.addChild("private", "urn:xmpp:carbons:2");
-		packet.addChild("no-copy", "urn:xmpp:hints");
-		packet.addChild("no-permanent-store", "urn:xmpp:hints");
-		packet.addChild("no-permanent-storage", "urn:xmpp:hints"); //do not copy this. this is wrong. it is *store*
-	}
-
 	public MessagePacket generateChat(Message message) {
 		MessagePacket packet = preparePacket(message);
 		String content;
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 2739bb5ad..1648988d4 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -919,7 +919,7 @@ public class XmppConnectionService extends Service {
 	public boolean hasInternetConnection() {
 		final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
 		try {
-			final NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+			final NetworkInfo activeNetwork = cm == null ? null : cm.getActiveNetworkInfo();
 			return activeNetwork != null && activeNetwork.isConnected();
 		} catch (RuntimeException e) {
 			Log.d(Config.LOGTAG, "unable to check for internet connection", e);