And even better messages ;-)

Signed-off-by: Ton Kersten <github@tonkersten.com>