Removes some custom handling, some of which were giving the wrong error on failure ("expected no error" when we were checking for an error). Signed-off-by: Sebastiaan van Stijn <github@gone.nl>