Added the error handling.  Now just need to add errors to each wrapper.