Merge "init: Make an error message more informative"