1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java
index a679d00c..49b0db21 100644
--- a/src/main/java/eu/siacs/conversations/parser/IqParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java
@@ -139,7 +139,11 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 		if(signedPreKeyPublic == null) {
 			return null;
 		}
-		return Integer.valueOf(signedPreKeyPublic.getAttribute("signedPreKeyId"));
+		try {
+			return Integer.valueOf(signedPreKeyPublic.getAttribute("signedPreKeyId"));
+		} catch (NumberFormatException e) {
+			return null;
+		}
 	}
 
 	public ECPublicKey signedPreKeyPublic(final Element bundle) {
@@ -255,7 +259,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 		Integer signedPreKeyId = signedPreKeyId(bundleElement);
 		byte[] signedPreKeySignature = signedPreKeySignature(bundleElement);
 		IdentityKey identityKey = identityKey(bundleElement);
-		if(signedPreKeyPublic == null || identityKey == null) {
+		if(signedPreKeyId == null || signedPreKeyPublic == null || identityKey == null) {
 			return null;
 		}