Merge "Protect against potential NPE" into main