X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=a152d303f4347a605a10f2a0b0a243f4bbf0b671;hb=374fd8726663084c37cf7ce2d7f752ca7a4f888e;hp=c271024c8d3127714c2a2ed9318b27dd80daa13c;hpb=48d71153c397d1715430773df3bb05102e962913;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index c271024..a152d30 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -100,18 +100,21 @@ public class SoneTemplatePage extends TemplatePage {
 	/**
 	 * Returns the currently logged in Sone.
 	 *
-	 * @param toadletContenxt
+	 * @param toadletContext
 	 *            The toadlet context
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	protected Sone getCurrentSone(ToadletContext toadletContenxt) {
-		Session session = getCurrentSession(toadletContenxt);
+	protected Sone getCurrentSone(ToadletContext toadletContext) {
+		Session session = getCurrentSession(toadletContext);
 		if (session == null) {
 			return null;
 		}
 		String soneId = (String) session.getAttribute("Sone.CurrentSone");
-		for (Sone sone : webInterface.core().localSones()) {
+		if (soneId == null) {
+			return null;
+		}
+		for (Sone sone : webInterface.core().getSones()) {
 			if (sone.getId().equals(soneId)) {
 				return sone;
 			}