More work on joda time

More work on joda time, handled null values.