move to develop
WCM-276 catch both exceptions