FS-28 Review and some minor changes (Null-checks / javadoc)