I've created a patch to handle this exception. Attaching it here.