#111: NLS/exception cleanup
#90: last leftovers