fixed schema comparison
fixed exception handling