Changes since last version: - Used Python's "for ... else:" (I found precedent for that in commands.py) - Created a bugreport and marked the patch as stable I recommend to take this patch for the upcoming Jan 1st 1.7.3 stable release or at least for 1.7.4.