Updated resolver to return null if not found per recommended standards