Add a timeout test
Add better error handling to sources