Replaced all null uses in AbstractSource with Options