Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorActionListener.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorActionListener.java	(revision 22882)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorActionListener.java	(revision 22883)
@@ -137,15 +137,13 @@
     String editPubAssessmentSiteProperty = "true";
 
     // First, get the site object
-    siteService = (SiteService) ComponentManager.get(SiteService.class);
-    toolManager = (ToolManager) ComponentManager.get(ToolManager.class);
     Site site = null;
-    if (siteService != null && toolManager != null) {
-        try {
-       	    site = siteService.getSite(toolManager.getCurrentPlacement().getContext());
-        } catch (Exception e) {
-        }
-    } 
+    try {
+	site = SiteService.getSite(ToolManager.getCurrentPlacement().getContext());
+    }
+    catch (IdUnusedException ex) {
+	// No site available
+    }
 
     // Does a site property 'samigo.editPubAssessment.restricted' exist?
     boolean sitePropertyExists = false;