Error Handle updated