Fixed NullPointer on date evaluation
More detailex exception management