Issue #8, set error on failure before file remove
Issue #7, Issue #8, Better timer management