I had a similar problem and I was told that its the brown line that comes from the ignition that needs to be tight and dry. I changed my oil once and spilled oil from the filter canister down on it and there was oil all in the line. I replaced it and got a tighther rubber fitting and the car shuts off and doesnt diesel anymore ever since. Hope you get it figured out.