Bugfix for moved X509 classes.
Bugfix for broken entities which are neither SP nor IdP