1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/TweetShell.java b/src/main/TweetShell.java
index 0849592..475590d 100644
--- a/src/main/TweetShell.java
+++ b/src/main/TweetShell.java
@@ -216,12 +216,7 @@ public class TweetShell implements TwitterApi.PinSupplier {
                 throw new NoSuchElementException();
             case target:
                 StreamImpl stream = (StreamImpl) getStream();
-
                 ResultListener oldListener = stream.getResultListener();
-                if (oldListener instanceof DataWriter) {
-                    ((DataWriter) oldListener).close();
-                }
-
                 switch (params[0]) {
                     case "file":
                         if (!(oldListener instanceof DataWriter)) {
@@ -237,10 +232,16 @@ public class TweetShell implements TwitterApi.PinSupplier {
                         }
                         break;
                     case "shell":
+                        if (oldListener instanceof DataWriter) {
+                            ((DataWriter) oldListener).close();
+                        }
                         if (!(oldListener instanceof StreamHandler)) {
                             stream.setResultListener(new StreamHandler());
                         }
                         break;
+                    default:
+                        System.err.println("Unrecognized target " + params[0]);
+                        break;
                 }
                 break;
             default:
@@ -248,5 +249,4 @@ public class TweetShell implements TwitterApi.PinSupplier {
         }
 
     }
-;
 }