Removed the allowed null for $server in match()