InputSource: ADDING SOME ROBUSTNESS + SIMPLIFYING