Add defensive programing, and a message