Add missing field, remove unused exception var