fiat scudo jtd

Hello i need some help with my fiat scudo 2.0 litre jtd hdi engine managment light as been on for weeks plug scan tool in code that comes up is p0230 which is fuel pump primary circuit malfuncution.I have changed fuel pump relay light still on. The van smokes like somebody as set some bushes on fire on starting up but clears after. But it as started cutting out every 200 ft or so when you drive it but when you turn engine off it carrie on running any help is much appreciated thanks ian.