FIX: Coverity Alerts
Merge pull request #413 from reneme/fix-coverity

FIX: Coverity Alerts