updated comments + exception