Fixed issue with Date displaying in incorrect order. DHH-258
Added nil check for dates. DHH-258