Merge "init: Actually check the return value for calls during first stage init"