A trick to fixing it is simply by clicking the esc button, saving, then click load, then it'll put you where you're supposed to be, I accidentally found this fix when a similar situation right after the Excalibur scenes happened then it put me back in the room where I was supposed to end up, also sorry if this isn't useful after being so late.