added type Number
Fixed NULL exception