Merge "init: Remove superfluous error check"