vladmos:fix_npe

Merge branch 'main' into fix_npe #4377
1m
Vladimir Moskva
· · Created
Fix a potential NPE #4374
2m
Vladimir Moskva
· · Created