Added more checks to wps failure