just improved error/log messages