fix: null warnings and errors