issue/1991-reader-comment-list-npe

Fix #1991 - NPE was caused by calling finish() without return.