Add timeout on fetching

Default was to wait forever which would make the app hang in some circumstances