Improve KeyNotFound-Errors

This should happen if an user enteres an invalid key (ie. filename).
Before that the system died with an NullPointerException, so this
change should be rather welcome.