Quick fix to plugin errors breaking watch