Added safety check for opportunity edge