add nil company handling