[1631] Fixed NoneType error on prod2.