Merge branch 'master' of https://github.com/spesmilo/electrum

electrum

@@ -179,8 +179,8 @@ if __name__ == '__main__':
             found = wallet.file_exists
             if not found:
                 found = gui.restore_or_create()
-        except IOError:
+        except SystemExit, e:
-            exit("Error retrieving wallet file.")
+            exit(e)
         except BaseException, e:
             import traceback
             traceback.print_exc(file=sys.stdout)