Bug fix: exceptions were being silently encapsulated and leaving
inconsistent data