Improved logging

removed 'die'
improved log messages