Add nil guard
Disambiguate and play :golf: