Fixed return statements in SchemaTool.