EUCA-7442, added several comments and else condition