Sonar critical fixes in EPAppCommonServiceImpl