BugFixes

Fixed some Error reporting bugs that slipped the net in the past commit