fix: Null pointer exception