Added the missing confirmation / error messages