Cleanup

Removal of unneeded messages.
Also added a check to see if the plugin is null.