Fix message (thanks Andre!) and exception while we are at it.