npe fixed
option value fix
JavaDoc