Corrected some issues.  Fixed NPE on plugin load.