Fixed  hanlding error