fix: fix null exception regression