Fix the following issues: https://ci-stg.openmrs.org/sonar/drilldown/issues/org.openmrs:openmrs?&rule=findbugs%3ARCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE&rule_sev=CRITICAL&severity=CRITICAL