fixes
new exceptions