Handling tap operations on a tap that has reference to a deleted stream

When trying to undeploy/destroy a tap that has reference to an already deleted stream fails with the following exception:
Command failed org.springframework.xd.rest.client.impl.SpringXDException: XD116E:(pos 4): unrecognized stream reference '<stream_name at the tap defintion>'.

As expected, the StreamConfigParser's lookupStream fails to find the stream name as the stream doesn't exist in the repository.

In this scenario, what is a better way to handle the tap operations.
Should we undeploy the tap when the stream is destroyed? ( though I don't see an easy way to find the taps that use a specific stream).