EMPIREDB-362 Exception improvment
20 files changed