A: he's not allowed in the bedroom ever.
B: I use a quart mason jar with lid for my water by the bed.

So peace reigns until around 5:30AM when he thinks I ought to be up...