- Sone sender = webInterface.getCore().getLocalSone(senderId);
- if (sender == null) {
- sender = getCurrentSone(request.getToadletContext()).get();
+ Optional<LocalSone> sender = webInterface.getCore().getLocalSone(senderId);
+ if (!sender.isPresent()) {
+ sender = getCurrentSone(request.getToadletContext());