"Is it back where I found you? We can fetch it and then start our journey! Of course if you have no bed then you are welcome to sleep with Bucephalus and I. The stables are quite comfortable and you can curl against me for warmth."

Problem solved as far as he was concerned. Sleeping in the hay would work just fine for them! (Probably not for Waver's hair but one problem at a time.)