Fix unhandled exception
Pull in bug fix
Merge branch 'debug_dbxcor'