FindKey now correctly behaves when key not found