Fix issue with null Pointer for Inputs of type list/map

No match.