Use normal wrapping for error state

Change-Id: I1027a6ba4821bacc66a310c5e1273f146fbcf17e
(cherry picked from commit 11367d911a464219e55dbd9f86ea5c981d6fc9e0)