Making sure all short codes return