Bugfix and better log message.