Throw KeyException instead of IllegalArgumentException

Throw KeyException instead of IllegalArgumentException #388