Fix null pointer errors.