improved error and log messages