Ah, my head was stuck with the previous structure of the code where it actually was optional. 
Fixed.