changes in exception handling
resolve merge conflict