Export: caseType null checking added