Merge "Fix NPE in toString"