GCP-5842 add null checking in junit