diff --git a/ext/tests/issue-1509.phpt b/ext/tests/issue-1509.phpt
new file mode 100644
index 00000000000..bffa931116b
--- /dev/null
+++ b/ext/tests/issue-1509.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Assertion failure on unclean shutdown - https://github.com/phalcon/cphalcon/issues/1509
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+$di = new \Phalcon\DI();
+$di->set('url', function() { return new NonExistingClass; });
+$di->get('url');
+?>
+--EXPECTF--
+Fatal error: Class 'NonExistingClass' not found in %s on line %d