Tweaked error and success message