Update from review
Update from review

Slight clean up of code based on code review. Biggest issue was the
change of `if session_id is None`, according to yusuf: "we used to have
a bug relating to empty session_id values", so i reverted the change as
a safeguard.

dailymuse/oz,dailymuse/oz,dailymuse/oz