[PATCH] make bug messages more consistent