Fix up player wrapper to validate player before returning it