Check if a custom message *is* defined

While you're at it - remove the second part (after the comma), it's redudant, even for a comment

Same for line 760