Additional error handling done.