Only remove $wrapper when it exists :) #14