commented out log
added exception macro