diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index 483eb2f52ca207b327246d96b03b243052d76c48..0f484eea73ff0a25ea0d2d42e1048d62ad2d0d8e 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -201,7 +201,7 @@ public class Bookmark extends Element implements ListItem {
 		} catch (final IllegalArgumentException e) {
 			try {
 				return tryFix ? getFullJid(gnu.inet.encoding.Punycode.encode(nick), false) : null;
-			} catch (final gnu.inet.encoding.PunycodeException | ArrayIndexOutOfBoundsException e2) {
+			} catch (final Exception e2) {
 				return null;
 			}
 		}
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 0f227660d1965eb85ebd617f5355a8a16961f231..22b907557cc4e4c3db2f8ab6e97e919a8f68e504 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -626,7 +626,7 @@ public class MucOptions {
         } catch (final IllegalArgumentException e) {
             try {
                 return tryFix ? createJoinJid(gnu.inet.encoding.Punycode.encode(nick), false) : null;
-            } catch (final gnu.inet.encoding.PunycodeException | ArrayIndexOutOfBoundsException e2) {
+            } catch (final Exception e2) {
                 return null;
             }
         }
diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index 91a4869bec9852c1d2f69bad1dd6616f9f91f5e9..c2d999f2ce3407bdf3c064d3f4d4112a639a8847 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -158,7 +158,7 @@ public abstract class AbstractParser {
 			if (nickname == null && nicknameIn != null && nick != null && gnu.inet.encoding.Punycode.decode(nick).equals(nicknameIn)) {
 				nickname = nicknameIn;
 			}
-		} catch (final gnu.inet.encoding.PunycodeException | ArrayIndexOutOfBoundsException e) { }
+		} catch (final Exception e) { }
 		Set<MucOptions.Hat> hats = new TreeSet<>();
 		for (Element hat : hatsEl.getChildren()) {
 			if ("hat".equals(hat.getName()) && ("urn:xmpp:hats:0".equals(hat.getNamespace()) || "xmpp:prosody.im/protocol/hats:1".equals(hat.getNamespace()))) {