Merge remote-tracking branch 'upstream/development' into fix_typo

1 files changed, 4 insertions, 0 deletions

diff --git a/src/eu/siacs/conversations/xml/XmlReader.java b/src/eu/siacs/conversations/xml/XmlReader.java
index 1c7e94e6..cf6b8c73 100644
--- a/src/eu/siacs/conversations/xml/XmlReader.java
+++ b/src/eu/siacs/conversations/xml/XmlReader.java
@@ -90,6 +90,10 @@ public class XmlReader {
 			throw new IOException("xml parser mishandled ArrayIndexOufOfBounds", e);
 		} catch (StringIndexOutOfBoundsException e) {
 			throw new IOException("xml parser mishandled StringIndexOufOfBounds", e);
+		} catch (NullPointerException e) {
+			throw new IOException("xml parser mishandled NullPointerException", e);
+		} catch (IndexOutOfBoundsException e) {
+			throw new IOException("xml parser mishandled IndexOutOfBound", e);
 		}
 		return null;
 	}