Added better error handling around source list management and parsing.