diff --git a/p4RemoveUnversioned.py b/p4RemoveUnversioned.py
index d5cbb3a..c5a918a 100644
--- a/p4RemoveUnversioned.py
+++ b/p4RemoveUnversioned.py
@@ -116,10 +116,11 @@ class Console( threading.Thread ):
                 if pid in self.buffers:
                     for line in self.buffers[ pid ]:
                         print( line )
+                    self.buffers.pop( pid, None )
             elif event == Console.MSG.CLEAR:
                 pid = data[ 1 ]
                 if pid in self.buffers:
-                    del self.buffers[ pid ]
+                    self.buffers.pop( pid, None )
 
 class Worker( threading.Thread ):
     def __init__( self, console, queue, files_to_ignore ):
@@ -173,7 +174,7 @@ class Worker( threading.Thread ):
             files = []
             command = "p4 fstat *"
 
-            proc = subprocess.Popen( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=directory )
+            proc = subprocess.Popen( command.split( ), stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=directory )
             (out, err) = proc.communicate()
 
             for line in err.decode('utf-8').split( os.linesep ):