Removed die() from debugging