Removed called to undefined "die" method in scap-2

Change-Id: Iaa5b407779a1755e9b7ab441fdf05ffcda796dbb
Merge "Removed called to undefined "die" method in scap-2" into production