Block till when something went wrong on setup

Change-Id: I5f9d92175631d34de918a8b4b24f94e733e05cb8