Got rid of empty catch, more consistent with parameter factory