Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	7 Dec 2001 21:07:35 -0000	1.13
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	11 Dec 2001 02:59:26 -0000	1.14
@@ -130,10 +130,12 @@
 	set workspace_portal_id [dotlrn::get_workspace_portal_id $user_id]
 
 	# Add the portlet here
-        calendar_portlet::make_self_available $workspace_portal_id
-	set element_id  [calendar_portlet::add_self_to_page \
-		$workspace_portal_id \
-		$calendar_id]
+        if { $workspace_portal_id != "" } {
+            calendar_portlet::make_self_available $workspace_portal_id
+            set element_id  [calendar_portlet::add_self_to_page \
+                    $workspace_portal_id \
+                    $calendar_id]
+        }
     }
 
     ad_proc -public add_user_to_community {
@@ -164,7 +166,9 @@
         
         # get the comm's calendar_id, and add it as a param to the
         # ws portal's calendar portal element
-        calendar_portlet::add_self_to_page $wsp_id $g_cal_id
+        if { $workspace_portal_id != "" } {
+            calendar_portlet::add_self_to_page $wsp_id $g_cal_id
+        }
     }
 
     ad_proc -public remove_user {
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	11 Dec 2001 00:00:00 -0000	1.18
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	11 Dec 2001 03:03:24 -0000	1.19
@@ -164,7 +164,9 @@
 	set workspace_portal_id [dotlrn::get_workspace_portal_id $user_id]
 
 	# Add the portlet here
-	fs_portlet::add_self_to_page $workspace_portal_id $package_id $folder_id
+	if { $workspace_portal_id != "" } {
+            fs_portlet::add_self_to_page $workspace_portal_id $package_id $folder_id
+        }
     }
 
     ad_proc -public remove_user {
Index: openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl	10 Dec 2001 23:57:09 -0000	1.7
+++ openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl	11 Dec 2001 03:03:55 -0000	1.8
@@ -116,7 +116,9 @@
 	set workspace_portal_id [dotlrn::get_workspace_portal_id $user_id]
 
 	# Add the portlet here
-	news_portlet::add_self_to_page $workspace_portal_id $package_id
+	if { $workspace_portal_id != "" } {
+            news_portlet::add_self_to_page $workspace_portal_id $package_id
+        }
     }
 
     ad_proc -public remove_user {