More error catching, don't delete admin user, etc.