added more checks to recreate deleted org