Added a timeout to the promises to support things that don't happen