Merge pull request #2315 from benoitc/more-verbose-exit-logging

Merge pull request #2315 from benoitc/more-verbose-exit-logging #138