Catch the "die" and cascade it to "terminate" so that stderr log output is preserved. Change-Id: Ifd915c8b705c78f9f8864d092f7dbecb2fc76a8b