*Fixing up exception.
*Fixed up word wrapping for long words.
*Added UnitTest.
Forgot to commit this.
*Noticed this is a pattern.
Merge pull request #2 from Therzok/master

Exception fix