Change the way we propogate errors a bit so that the library portion
doesn't throw panics.