forgot to commit this file out with the previous commit to improve
exception handling