Improve logging
Do not take any risk
Re throw the exception
More fixes for #1614