OC-1815 - Fixing mandatory fields bug when empty.

@jamesallsup