Index: site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteBrowserAction.java
===================================================================
--- site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteBrowserAction.java	(revision 40059)
+++ site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteBrowserAction.java	(working copy)
@@ -318,14 +359,14 @@
 
 		context.put("siteTypes", newTypes);
 
-		//List terms = CourseManagementService.getTerms();
-		List terms = cms.getAcademicSessions();
-
 		String termSearchSiteType = (String) state.getAttribute(SEARCH_TERM_SITE_TYPE);
 		if (termSearchSiteType != null)
 		{
 			context.put("termSearchSiteType", termSearchSiteType);
-			context.put("terms", terms);
+			if (cms != null) 
+			{
+				context.put("terms", cms.getAcademicSessions());
+			}
 		}
 
 		return "_simpleSearch";