Adding some safety stuff