- enhanced exception handling