Modified unsafe use of Option.get so we should have less errors in the l...

...ogs.