I wonder if we're rather just warn here and not return nil?