Fix for issue #214, more detailed error reporting in certain scenarios