I'm always happy to talk about the design of
Gabriel Knight.
Spoiler:Unless I'm mistaken, though, the elevator doesn't actually return upstairs unless and until you have left both the required objects in there - so it's possible to rectify the mistake of having failed to do so right up until the moment you go to the room Grace is being kept in.
So it's sort of a kinder, gentler dead end. 
