Add some verbosity when errors occur

This patch can be applied to the other 2 files.