Added code to reduce issues with race conditions and bad wps server
implementations.