Index: site-impl/impl/src/java/org/sakaiproject/site/impl/BaseToolConfiguration.java =================================================================== --- site-impl/impl/src/java/org/sakaiproject/site/impl/BaseToolConfiguration.java (revision 59334) +++ site-impl/impl/src/java/org/sakaiproject/site/impl/BaseToolConfiguration.java (working copy) @@ -531,7 +531,11 @@ */ protected String localizeTool() { - String localizedTitle = ActiveToolManager.getLocalizedToolProperty(getTool().getId(), "title"); + Tool tool = getTool(); + if(tool == null) { + return ""; //we dont need a tool title as we won't even have a page + } + String localizedTitle = ActiveToolManager.getLocalizedToolProperty(tool.getId(), "title"); // Use localized title if present if(localizedTitle != null && localizedTitle.length()>0) Index: site-impl/impl/src/java/org/sakaiproject/site/impl/BaseSitePage.java =================================================================== --- site-impl/impl/src/java/org/sakaiproject/site/impl/BaseSitePage.java (revision 59334) +++ site-impl/impl/src/java/org/sakaiproject/site/impl/BaseSitePage.java (working copy) @@ -516,7 +516,9 @@ for (Iterator iTools = getTools().iterator(); iTools.hasNext();) { BaseToolConfiguration tool = (BaseToolConfiguration)iTools.next(); - localizedTitle = tool.localizeTool(); + if(tool!=null) { + localizedTitle = tool.localizeTool(); + } } // if one and only one tool title exists (and it's valid) replace page title with localized tool title