more null checks for /star