Moving to a catch based mechanism inside of plugin itself