Merge "init: add error handling in control message"