diff --git a/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java b/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
index 5fdc54c39..207adf368 100644
--- a/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
+++ b/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
@@ -77,6 +77,8 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 				result = reader.decode(bitmap);
 			} catch (ReaderException e) {
 				return null; // No barcode found
+			} catch (RuntimeException e) {
+				return null; // Decoding failed due to bug in decoder
 			} finally {
 				reader.reset();
 			}