Bugfix in handling the construction of the exit message