NotFound plug-whipping