--- loncom/lond	2006/08/29 21:08:08	1.340
+++ loncom/lond	2006/09/05 15:35:14	1.342
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.340 2006/08/29 21:08:08 raeburn Exp $
+# $Id: lond,v 1.342 2006/09/05 15:35:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.340 $'; #' stupid emacs
+my $VERSION='$Revision: 1.342 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3454,7 +3454,7 @@ sub dump_course_id_handler {
             }
             unless ($typefilter eq '.' || !defined($typefilter)) {
                 my $unescapeType = &unescape($type);
-                if (!defined($type)) {
+                if ($type eq '') {
                     if ($typefilter ne 'Course') {
                         $match = 0;
                     }
@@ -4200,7 +4200,11 @@ sub validate_class_access_handler {
     my $userinput = "$cmd:$tail";
     my ($inst_class,$courseowner,$cdom) = split(/:/, $tail);
     $courseowner = &unescape($courseowner);
-    my $outcome=&localenroll::check_section($inst_class,$courseowner,$cdom);
+    my $outcome;
+    eval {
+	local($SIG{__DIE__})='DEFAULT';
+	$outcome=&localenroll::check_section($inst_class,$courseowner,$cdom);
+    };
     &Reply($client,"$outcome\n", $userinput);
 
     return 1;