small tweaks - better error info