fix: null pointer fix