Restructure comment setup and added a simple exception handler for comment-package