Thanks for the replies. He was crated at night but is now in a dog bed so I would rather not go back to crating him, I think that would distress him even more as he is used to having some freedom in the house.

I had thought about using a spray collar, where did you get it from? My only worry is that this isn't solving the problem of him being distressed! anyone had bad experiences of spray collars?