Working on #503, handle case with no lookup_context