Switch back to return null instead of false if no parameter is matched