Revert "Do not re-throw error."

This reverts commit e7005c8c1fb5ced80688e646b1be94cfe18fbe38.
Revert "Revert "Do not re-throw error.""

This reverts commit c8b9a39edd6363eb0f2f39e83acb28642d8cf4ec.
Merge remote-tracking branch 'origin/master'