diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index 50ad7f38c..6e1e5ae5f 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -47,7 +47,7 @@ public abstract class AbstractParser {
 					try {
 						min = Math.min(min,AbstractParser.parseTimestamp(stamp));
 						returnDefault = false;
-					} catch (ParseException e) {
+					} catch (Throwable t) {
 						//ignore
 					}
 				}
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index 72dffc4da..972ac5fd3 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -226,7 +226,7 @@ public class PresenceParser extends AbstractParser implements
 					final String since = idle.getAttribute("since");
 					contact.setLastseen(AbstractParser.parseTimestamp(since));
 					contact.flagInactive();
-				} catch (NullPointerException | ParseException e) {
+				} catch (Throwable throwable) {
 					if (contact.setLastseen(AbstractParser.parseTimestamp(packet))) {
 						contact.flagActive();
 					}