Critial Crash Fix

My cleanup of `NotImplementedExceptions' in #1985 introduced a critical bug.  

This restores the previous behavior and adds comments to make it clear why it works like it does.