20130915 Fix nullpoint exception.