Fix some Exceptions