[artf640753] Null checked for build failure