Added 10 minute timeout
Made timeout throw an error instead of saying 'Finished'