WCM-276 Catch BeanLocatorException instead