Fixing up some more random bugs that have to deal with error checking.