diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index cde23f78..055943f1 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -2,8 +2,6 @@
 
 - try to explain what the code is about
 - try to follow [PEP0008](https://www.python.org/dev/peps/pep-0008/)
-- make the pull request against the ["v0.6" branch](https://github.com/Bitmessage/PyBitmessage/tree/v0.6)
-- it should be possible to do a fast-forward merge of the pull requests
 - PGP-sign the commits included in the pull request
 - try to use a good editor that removes trailing whitespace, highlights potential python issues and uses unix line endings
 - You can get paid for merged commits if you register at [Tip4Commit](https://tip4commit.com/github/Bitmessage/PyBitmessage)
@@ -13,3 +11,4 @@ If for some reason you don't want to use github, you can submit the patch using
 
 For helping with translations, please use [Transifex](https://www.transifex.com/bitmessage-project/pybitmessage/). There is no need to submit pull requests for translations.
 For translating technical terms it is recommended to consult the [Microsoft Language Portal](https://www.microsoft.com/Language/en-US/Default.aspx).
+
diff --git a/README.md b/README.md
index 06cba098..5dfe24df 100644
--- a/README.md
+++ b/README.md
@@ -29,3 +29,4 @@ References
 * [Installation](https://bitmessage.org/wiki/Compiling_instructions)
 * [Discuss on Reddit](https://www.reddit.com/r/bitmessage)
 * [Chat on Gitter](https://gitter.im/Bitmessage/PyBitmessage)
+
diff --git a/src/class_objectProcessorQueue.py b/src/class_objectProcessorQueue.py
index 01854a74..b6628816 100644
--- a/src/class_objectProcessorQueue.py
+++ b/src/class_objectProcessorQueue.py
@@ -18,10 +18,7 @@ class ObjectProcessorQueue(Queue.Queue):
         Queue.Queue.put(self, item, block, timeout)
 
     def get(self, block = True, timeout = None):
-        try:
-            item = Queue.Queue.get(self, block, timeout)
-        except Queue.Empty:
-            raise Queue.Empty()
+        item = Queue.Queue.get(self, block, timeout)
         with self.sizeLock:
             self.curSize -= len(item[1])
         return item