Change again to use Hash.fetch because the query can return nil.