fixing lazy code analysis warnings
Merge pull request #415 from blairconrad/fix-lazy-code-analysis-warnings

fixing lazy code analysis warnings