DELTASPIKE-421 Optional single results.
DELTASPIKE-448 Refactoring of exception handling