APOLLO-4157 Fix for nullable annotation