No nullpointer if Joption aborted
Merge remote-tracking branch 'origin/master'