I moved this code after discussion with @lslezak , is excluding the only correct way of handling that case?