Code robustness
Merge pull request #216 from TwistedLogic/master

Code robustness