Finished error logging tweaks to fix #17