Fixed error/success messaging