Just because he warned Elsa doesn't mean he loves her. He can care about a person and not want them to have harm come to them and still love Nadia. I didn't think he was supposed to kill her, he was probably planning on following her to 'the economist' or getting the info from her as to his whereabouts. He only killed her because he had to.