Added transformation from NSNull to NSNumber