Rwanda bill will be 'watertight', minister says after new treaty