Update error handeling