We now correctly unwrap empty Scala Options so the unwrapping no longer fails. Original pull request: #165.