Just a quick heads up that I created
https://github.com/weld/core/pull/1844 (for 2.4) and https://github.com/weld/core/pull/1845 (for master) after receiving a bug report from another engineer. The fix is simply adding a null check to an if statement. I tagged them as part of WELD-1130 as this issue is a continuation of that one. Let me know if you'd prefer it to go under a new number.

Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number 741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU