more NSD hacks, including a new exception thrown when loading a session at a differen...