More proper fix for #4083 (IMO), more useful failure messages