modified handler to maintain Error prop names