Minor API changes

Shouldn't we fail the Future if SCN returns an error instead of returning None?