Fix issue 107: timestamps are updated even if guard fails.
Merge pull request #109 from troessner/issue-107-timestamps-are-updated-even-if-guard-fails

Fix issue 107: timestamps are updated even if guard fails.