Nibg 1429

Check if either one (apiKey/ apiContext) is not available, then use the old one.