fix to really catch all scattered exceptions