@fabpot I'll submit a PR soon as I think this brings back the problem which your previous patch fixed.
If I read this right, it will start the session anyway, no?