SAMZA-86; Convert GetOffset.getNextOffset to use Option instead of null when no offset is available. Applying patch again, with fixed NPE issue.