Patch for #7
Nicer message. props wpperform