Merge "Fix null pointer exception" into froyo