Fix exceptions...