Another fix anticipating a possible error.