Patch 13

Made error handling slightly better by implementing what previously had
been an utterly useless and superfluous method.