Improve message (thanks to Ricardo).