bzr: ERROR: exceptions.AttributeError: 'NoneType' object has no attribute 'count'

[Dimitri John Ledkov]

Wile merging debian/ & ubuntu/ branches I got this:
Committed revision 37.
Unapplying quilt patches to prevent spurious conflicts
bzr: ERROR: exceptions.AttributeError: 'NoneType' object has no attribute 'count'

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 920, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1131, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 695, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4446, in run
    verified)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4465, in _do_merge
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 686, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 653, in _do_merge_to
    hook(merge)
  File "/home/tdlk/.bazaar/plugins/builddeb/__init__.py", line 239, in pre_merge
    pre_merge_quilt(merger)
  File "/home/tdlk/.bazaar/plugins/builddeb/__init__.py", line 284, in pre_merge_quilt
    raise QuiltUnapplyError("base", e.stderr)
  File "/home/tdlk/.bazaar/plugins/builddeb/errors.py", line 247, in __init__
    if msg.count("\n") == 1:
AttributeError: 'NoneType' object has no attribute 'count'