issue_109: guard against empty end time
Merge branches 'issue_108' and 'issue_109' into financial