Revert "Revert "With error""

This reverts commit 6762e99b968cbac1584ea883aab05f03d33c3e00.