This behaviour is wrong, so in addition to changing what happens on exception, we now throw an exception if the key doesn't exist as well.