Director: Improved exception handling