Guard against null in resolver