Fix exceptions, microfix