Change 'die()' to throwing exception from last commit