fixes for async exceptions