[fix] added null check