Fixes

Added exceptions