Fix exceptions, and update dependencies