Merge pull request #457 from am11/master

TsLint: More cleanner error handling
Code: Minor fixes.