Updated to Xtend 2.7.1
Revised exception handling