Move multiplicity check to the early stage

.. no need to do it late