Improved error reporting and a few small additional plugin actions