Revert "Fixed exception errors"

This reverts commit 8ad80891ee1b419cd33c9c36b66411250624d02c.