exception bugfix