Company Id should not be @Nullable for endpoints which use it

@tejohnso please review