Add rudimentary exception & error handling