Add to key lookup exception logic and adjust formatting.