1 files changed, 4 insertions, 3 deletions
diff --git a/qa/rpc-tests/skeleton.py b/qa/rpc-tests/skeleton.py
index 5d4b62e55f..126b6bfaf4 100755
--- a/qa/rpc-tests/skeleton.py
+++ b/qa/rpc-tests/skeleton.py
@@ -45,6 +45,7 @@ def main():
     check_json_precision()
 
     success = False
+    nodes = []
     try:
         print("Initializing test directory "+options.tmpdir)
         if not os.path.isdir(options.tmpdir):
@@ -63,12 +64,12 @@ def main():
         print("Assertion failed: "+e.message)
     except Exception as e:
         print("Unexpected exception caught during testing: "+str(e))
-        stack = traceback.extract_tb(sys.exc_info()[2])
-        print(stack[-1])
+        traceback.print_tb(sys.exc_info()[2])
 
     if not options.nocleanup:
         print("Cleaning up")
-        stop_nodes()
+        stop_nodes(nodes)
+        wait_bitcoinds()
         shutil.rmtree(options.tmpdir)
 
     if success: