diff --git a/app/src/main/java/com/beemdevelopment/aegis/otp/GoogleAuthInfo.java b/app/src/main/java/com/beemdevelopment/aegis/otp/GoogleAuthInfo.java
index 0f35e7b5..7a522c4d 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/otp/GoogleAuthInfo.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/otp/GoogleAuthInfo.java
@@ -101,7 +101,7 @@ public class GoogleAuthInfo {
                 default:
                     throw new GoogleAuthInfoException(String.format("unsupported otp type: %s", type));
             }
-        } catch (OtpInfoException e) {
+        } catch (OtpInfoException | NumberFormatException e) {
             throw new GoogleAuthInfoException(e);
         }
 
@@ -141,7 +141,7 @@ public class GoogleAuthInfo {
             if (digits != null) {
                 info.setDigits(Integer.parseInt(digits));
             }
-        } catch (OtpInfoException e) {
+        } catch (OtpInfoException | NumberFormatException e) {
             throw new GoogleAuthInfoException(e);
         }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
index 1abf82ad..4776ddbd 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
@@ -108,7 +108,7 @@ public class ScannerActivity extends AegisActivity implements ZXingScannerView.R
     public void handleResult(Result rawResult) {
         try {
             // parse google auth uri
-            GoogleAuthInfo info = GoogleAuthInfo.parseUri(rawResult.getText());
+            GoogleAuthInfo info = GoogleAuthInfo.parseUri(rawResult.getText().trim());
             VaultEntry entry = new VaultEntry(info);
 
             Intent intent = new Intent();