b6 1.9 tdi 08 random cut out issue

[vwpsst16]

Has anyone come across this? engine cuts out in neutral mostly , but last time in first gear. it'll restart straight away as if nothing happened . oil pressure light also been on . it was taken to garage who said it didn't come on for them but they changed oil pressure switch . since had light on again along with parking brake light { just had new switch }. switched off and restarted and has driven fine since . all a bit weird but must be a link. Anyone got any ideas ?