Handle lookup failures better