diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp
index 3cd280b7..5894e103 100644
--- a/src/controller/controller.cpp
+++ b/src/controller/controller.cpp
@@ -101,19 +101,6 @@ void Controller::run()
 
         startCommandExecution();
 
-    } catch (const std::invalid_argument& exc) {
-        if (isInStdinMode) {
-            // Pass invalid argument message to the caller just in case it may be interested
-            // The result will be {"invalid-argument" : message}
-            // Command parameter is only used if exception will be raised during json creation
-            writeResponseToStdOut(isInStdinMode, {{QStringLiteral("invalid-argument"), exc.what()}},
-                                  "invalid-argument");
-            // Exit directly here
-            disposeUI();
-            exit();
-            return;
-        }
-        onCriticalFailure(exc.what());
     } catch (const std::exception& error) {
         onCriticalFailure(error.what());
     }
diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp
index 9da3026e..3c91341a 100644
--- a/src/ui/webeiddialog.cpp
+++ b/src/ui/webeiddialog.cpp
@@ -292,9 +292,9 @@ QString WebEidDialog::getPin()
     // QString uses QAtomicPointer internally and is thread-safe.
     // There should be only single reference and this is transferred to the caller for safety
     QString ret = pin;
-	// Cannot use eraseData because we have to force Qt copy-on-write
-	pin.fill('\0');
-	pin.clear();
+    // Cannot use eraseData because we have to force Qt copy-on-write
+    pin.fill('\0');
+    pin.clear();
     return ret;
 }