Fixed issue with buffering, expanded exception info