update exceptions + fixes