Better exception handling and added get matches for admin