diff --git a/contrib/wallettools/walletchangepass.py b/contrib/wallettools/walletchangepass.py
index 30f3f5b26a..8917a03e7f 100755
--- a/contrib/wallettools/walletchangepass.py
+++ b/contrib/wallettools/walletchangepass.py
@@ -1,5 +1,6 @@
 from jsonrpc import ServiceProxy
+import getpass
 access = ServiceProxy("http://127.0.0.1:8332")
-pwd = raw_input("Enter old wallet passphrase: ")
-pwd2 = raw_input("Enter new wallet passphrase: ")
-access.walletpassphrasechange(pwd, pwd2)
\ No newline at end of file
+pwd = getpass.getpass(prompt="Enter old wallet passphrase: ")
+pwd2 = getpass.getpass(prompt="Enter new wallet passphrase: ")
+access.walletpassphrasechange(pwd, pwd2)
diff --git a/contrib/wallettools/walletunlock.py b/contrib/wallettools/walletunlock.py
index f847c6fe61..cb7e0f22a2 100755
--- a/contrib/wallettools/walletunlock.py
+++ b/contrib/wallettools/walletunlock.py
@@ -1,4 +1,5 @@
 from jsonrpc import ServiceProxy
+import getpass
 access = ServiceProxy("http://127.0.0.1:8332")
-pwd = raw_input("Enter wallet passphrase: ")
-access.walletpassphrase(pwd, 60)
\ No newline at end of file
+pwd = getpass.getpass(prompt="Enter wallet passphrase: ")
+access.walletpassphrase(pwd, 60)
diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 1afa773009..63a7144474 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -58,7 +58,7 @@ def parse_po(text):
 if not XGETTEXT:
     print('Cannot extract strings: xgettext utility is not installed or not configured.',file=sys.stderr)
     print('Please install package "gettext" and re-run \'./configure\'.',file=sys.stderr)
-    exit(1)
+    sys.exit(1)
 child = Popen([XGETTEXT,'--output=-','-n','--keyword=_'] + files, stdout=PIPE)
 (out, err) = child.communicate()