[FIX] Missing mandatory check