Added more safety.