that's probably the first place I would start Andy but also pay careful attention to any rubber hoses, vacuum lines and anything likely to draw draw unregulated air and cause a vacuum leak which may also cause similar symptoms
Let us know how you get on with it