diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index 2afe111..4f78932 100644
--- a/Lib/test/test_nis.py
+++ b/Lib/test/test_nis.py
@@ -5,21 +5,22 @@
     verbose = 1
 
 maps = nis.maps()
-try:
-    for nismap in maps:
+done = 0
+for nismap in maps:
+    if verbose:
+	print nismap
+    mapping = nis.cat(nismap)
+    for k, v in mapping.items():
 	if verbose:
-	    print nismap
-	mapping = nis.cat(nismap)
-	for k, v in mapping.items():
-	    if verbose:
-		print '    ', k, v
-	    if not k:
-		continue
-	    if nis.match(k, nismap) <> v:
-		print "NIS match failed for key `%s' in map `%s'" % (k, nismap)
-	    else:
-		# just test the one key, otherwise this test could take a
-		# very long time
-		raise 'done'
-except 'done':
-    pass
+	    print '    ', k, v
+	if not k:
+	    continue
+	if nis.match(k, nismap) <> v:
+	    print "NIS match failed for key `%s' in map `%s'" % (k, nismap)
+	else:
+	    # just test the one key, otherwise this test could take a
+	    # very long time
+	    done = 1
+	    break
+    if done:
+	break