Update comment and replace LogicException by RuntimeException