Output a newline too

Remove redundant die() call. Die too on other errors

Change-Id: I4d4fce586d629d265ef71d7121f1325c194af4c3