[fixes: #6, #49681391] Move exception declaration and class comments