Remove empty if block in executeTransaction
Restructure the exceptions
Modify internal ds to adhere to the exception changes
Minor modification to test