improve comment and exception message more friendly :)