introduce a new exception and tweaks related to this
tweak logging