Move till after error case