diff --git a/get_history b/get_history
new file mode 100755
index 00000000..32641152
--- /dev/null
+++ b/get_history
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+
+import sys
+from electrum import TcpStratumInterface
+
+try:
+    addr = sys.argv[1]
+except:
+    print "usage: get_history <bitcoin_address>"
+    sys.exit(1)
+
+i = TcpStratumInterface('ecdsa.org', 50001)
+i.init_socket()
+i.start()
+i.send([('blockchain.address.get_history',[addr])])
+
+while True:
+    r = i.responses.get(True, 100000000000)
+    method = r.get('method') 
+    if method == 'blockchain.address.get_history':
+        confirmed = unconfirmed = 0
+        h = r.get('result')
+        for item in h:
+            print item['tx_hash'], item['value']
+
+        break
diff --git a/watch_address b/watch_address
index 698d9b48..843ae744 100755
--- a/watch_address
+++ b/watch_address
@@ -7,6 +7,7 @@ try:
     addr = sys.argv[1]
 except:
     print "usage: watch_address <bitcoin_address>"
+    sys.exit(1)
 
 i = TcpStratumInterface('ecdsa.org', 50001)
 i.init_socket()