Correct output error message

One of the error messages contain a tab character at its end instead of newline
character. Fix it to make the message display properly.
Merge remote-tracking branch 'origin/master'
Apply usual PEP8 related fixes

As usual, missing spaces after commas, too few blank lines between functions.
I add appropriately.