Plugin Exception Handling Fix.