Added safer fallback if  not found for some reason