Add error support for recreate org