more robust exception message
Fix conflicts. Merge.