Thanks for your help. I am thinking after doing a bit of searching that it could be a Lesser yellow Underwing, as these feed on thistles and other shrubs.

I found this Caterpillar on Creeping Thistle. It is about 3 cm long but5 I cant find an ID for it. It also has a fork in the tail end.