Code Cleanup, fail message on pm