FIX: add check for signature availability in XML too.