Add check for g_extern.system.no_content as well