diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 908fe5760d..e0bd93eef8 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.39 2000/09/01 22:17:53 bwelling Exp $ */
+/* $Id: nslookup.c,v 1.40 2000/09/01 22:45:16 bwelling Exp $ */
 
 #include <config.h>
 
@@ -740,10 +740,8 @@ get_next_command(void) {
 		return;
 	}
 	ptr = strtok(input, " \t\r\n");
-	if (ptr == NULL) {
-		in_use = ISC_FALSE;
+	if (ptr == NULL)
 		return;
-	}
 	arg = strtok(NULL, " \t\r\n");
 	if ((strcasecmp(ptr, "set") == 0) &&
 	    (arg != NULL))
@@ -755,6 +753,18 @@ get_next_command(void) {
 	} else if (strcasecmp(ptr, "exit") == 0) {
 		in_use = ISC_FALSE;
 		return;
+	} else if (strcasecmp(ptr, "help") == 0 ||
+		   strcasecmp(ptr, "?") == 0)
+	{
+		printf("The '%s' command is not yet implemented.\n", ptr);
+		return;
+	} else if (strcasecmp(ptr, "finger") == 0 ||
+		   strcasecmp(ptr, "root") == 0 ||
+		   strcasecmp(ptr, "ls") == 0 ||
+		   strcasecmp(ptr, "view") == 0)
+	{
+		printf("The '%s' command is not implemented.\n", ptr);
+		return;
 	} else
 		addlookup(ptr);
 }