Fixes another error with #14 - message needs to be escaped on cleanup too