Changing to be more defensive which I think is the correct thing to do.