Issue-3479860-fix-constructors-which: Added custom filter will be more robust...

Issue-3479860-fix-constructors-which: Added custom filter will be more robust and less likely to encounter fatal errors due to null arguments.

Closes #3479860