Provide better logging and raised exception message