Added proper termination upon failure.