Reverted error changes from commit e73bf47ac00529ed6c63eb6394f5eef4e15162c0