Added another missing throws annotation
Set incremented value on model.
Remove double if
remove double if
Shorten line.