Incorporated the last change about plugin autoloading to all relevant error messages