working on integrating new exception handling