This makes it compatible with the current code and avoid any possible crash. Original author: yamasani Merged from: //branches/cupcake/... Automated import of CL 145851