evaluate exceptions only if not empty
Merge branch 'feature/indicators-refactor'