Removed die() added exception