diff --git a/debian/changelog b/debian/changelog
index 45fde6b4..e3cbe562 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.399) UNRELEASED; urgency=medium
+
+  * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
+    kill the snappy os build if the initramfs-tools-ubuntu-core package
+    is not found
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Sun, 10 Apr 2016 17:23:05 +0200
+
 livecd-rootfs (2.398) xenial; urgency=medium
 
   * switch snappy package builds from "snappy build" to "snapcraft snap"
diff --git a/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot b/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot
index 896cfa48..c967bc7c 100755
--- a/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot
+++ b/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot
@@ -5,6 +5,9 @@ set -ex
 IVER="$(dpkg -s initramfs-tools-ubuntu-core | \
 			sed -n '/^Version:/{s/^[^: ]*: \([^: ]*\).*/\1/;p;}')"
 
+# fail the build if we did not find the snappy initrd package
+[ -n "$IVER" ] || exit 1
+
 # force lzma
 mkdir -p /etc/initramfs-tools/conf.d
 echo "COMPRESS=lzma" >/etc/initramfs-tools/conf.d/snappy-generic-initrd.conf