Code

Added robustness for wrong imported schema files