Only the case of the current wifi going from state "Ready" -> "Disconnected" is handled, but the "Failure" state is not handled. Also, I was unable to find any guarantee that connman will first report the service as failing before removing it. So it should probably be handled if connman reports the service being removed at the very least.

I have a patch prepared to fix this and will submit it in a second.