Adding some extra wait checks that are in Girder