Throw exception instead of loging
Code clean up
IDEX-1125