Add some extra checks & verbosity (bug #3686)