Fixed some over-zealous error handling