- Sone sender = webInterface.getCore().getLocalSone(senderId, false);
- if (sender == null) {
- sender = getCurrentSone(request.getToadletContext());
+ Optional<Sone> sender = webInterface.getCore().getLocalSone(senderId);
+ if (!sender.isPresent()) {
+ sender = fromNullable(getCurrentSone(request.getToadletContext()));
+ if (!sender.isPresent()) {
+ return createErrorJsonObject("invalid-sone-id");
+ }