Maz’s ownership of the saber was something I was trying to figure out at some point, and thought it could work to have it be part of Rey’s vision in the previous scene. I abandoned the idea since I thought it would disrupt the scene too much, but here’s one way it could work:
Password: fanedit
Obviously just a mockup, but all the elements are there and I think it may actually add something. Leia’s ‘Bring him home’ could refer both to her later line regarding her son as well as instruction to Maz to find Han and bring him back to her, Maz being a trusted confidant of both parties. Or it could even refer to Luke, since Leia could have deputized Maz into the Luke quest at some point and thought giving her the saber would help somehow.
It’s not the ideal solution, but I think it works better than the current state. At least it’s a hint of where she gets the saber. But to work, I think it would be better to cut Han’s questioning Maz about that. Cutting it, it would implies that he already knows that the saber is with Maz.