Merge "API: Check for nosuchsection in all code paths"