Merge "Fix missing exception catch in is_admin_available()"