CAAERS-7059, added check for null when converting.