Format
Add check for avoid NPE