fixed ordering issue with exception handling