Feature/en 1889

Should log the exception if not passing it back so that we can see when things go wrong.