We solved it our way, not perfect but worked and we were able to file all our returns.

We put $2 dollars as foreign sourced non-resident income (clients had nil foreign sourced income) and it was calculated properly, accepted by CRA.  All our returns are accepted now.