oops; put exception handling back in