Fix a few correctness bugs flagged by SpotBugs (static analysis)#161

ato merged 2 commits into

iipc:masteriipc/webarchive-commons:masterfrom

vejtom:fix-spotbugs-correctnessvejtom/webarchive-commons:fix-spotbugs-correctnessCopy head branch name to clipboard