Add better error handling while running the plugin
Add better error handling while running the plugin