diff --git a/src/routes/api/pakubiiti/getAlbums/[count]/+server.ts b/src/routes/api/pakubiiti/getAlbums/[count]/+server.ts
index 4194233..f09c3cf 100644
--- a/src/routes/api/pakubiiti/getAlbums/[count]/+server.ts
+++ b/src/routes/api/pakubiiti/getAlbums/[count]/+server.ts
@@ -1,15 +1,19 @@
 import { albumState } from '$lib/server/AlbumState.svelte';
 import { spotifyAPI } from '$lib/server/Spotify.svelte';
 import type { AlbumSolveState } from '$lib/types';
-import { json } from '@sveltejs/kit';
+import { error, json } from '@sveltejs/kit';
+
+const maxTries = 10;
 
 export async function GET({ params }) {
-	const count = params.count || 1;
+	const count = Number(params.count) || 1;
 
 	const albums: AlbumSolveState[] = [];
+	let tries = 0;
 
-	for (let i = 0; i < count; i++) {
+	while (albums.length < count && tries++ < maxTries) {
 		const album = await spotifyAPI.getRandomAlbum();
+
 		if (album) {
 			const image = album.images.at(0);
 			if (!image?.url) {
@@ -24,6 +28,12 @@ export async function GET({ params }) {
 		}
 	}
 
+	if (albums.length !== count) {
+		albumState.setAlbums([]);
+
+		return error(500, "Couldn't get albums from Spotify.");
+	}
+
 	albumState.setAlbums(albums);
 
 	return json({ albums: albums });
diff --git a/src/routes/vinge/pakubiiti/+page.server.ts b/src/routes/vinge/pakubiiti/+page.server.ts
index 3015481..b227152 100644
--- a/src/routes/vinge/pakubiiti/+page.server.ts
+++ b/src/routes/vinge/pakubiiti/+page.server.ts
@@ -56,6 +56,11 @@ export const load: PageServerLoad = async ({ fetch, locals }) => {
 				images: shuffleArray(albumImages),
 				artists: shuffleArray(albumArtists)
 			};
+		})
+		.catch((err) => {
+			console.log(err);
+
+			return undefined;
 		});
 
 	return {
diff --git a/src/routes/vinge/pakubiiti/+page.svelte b/src/routes/vinge/pakubiiti/+page.svelte
index 2606a9d..c4c255d 100644
--- a/src/routes/vinge/pakubiiti/+page.svelte
+++ b/src/routes/vinge/pakubiiti/+page.svelte
@@ -112,10 +112,20 @@
 				</div>
 				{@render footer(true)}
 			{:then albums}
-				<div class="grid w-full gap-4" in:fade={{ duration: 150, delay: 150, easing: expoOut }}>
-					{@render playArea(albums as AlbumData)}
-				</div>
-				{@render footer(false)}
+				{#if albums}
+					<div class="grid w-full gap-4" in:fade={{ duration: 150, delay: 150, easing: expoOut }}>
+						{@render playArea(albums as AlbumData)}
+					</div>
+					{@render footer(false)}
+				{:else}
+					<p class="mx-auto mt-16 max-w-prose text-center text-lg text-red-500">
+						<strong>Serveris tekkis mingi error.</strong>
+						<br />No clue miks see katki on, sorry.
+					</p>
+					<p class="mx-auto mt-6 max-w-prose text-center text-lg text-red-500">
+						Proovi uuesti või kirjuta mulle.
+					</p>
+				{/if}
 			{/await}
 		{:else}
 			<div class="grid w-full gap-4" out:fade={{ duration: 150, easing: expoOut }}>