Plug15 fix

Removed erroneous error message and handled a potential nullpointerexception