adding error handling
Merge branch 'master' of https://github.com/CognizantIPL/AieGateway.git