Use normal wrapping for error state

Change-Id: I1027a6ba4821bacc66a310c5e1273f146fbcf17e