Bump up error checking and add new spec