Not critical, safe-guard currently is not really needed, but still better to be correct.
@vkrause @mlaurent