<p><span>MP1-4968 exposes some exceptions that are occuring at normal use.</span></p>

<p><span>These should be fixed, so exceptions only occur in exceptional situations</span></p>