{_} Spacing
Fix NPE

Change-Id: I2ef4fd39c3ce92258730260806ab73557a3edb5a