Re #1150 Preventing illegalArgumentException when value is null