OZP-850 - added exception handling also updated list method to owf7's behavior