Null value keys are now removed on entry and error messages have been made more verbose