- Added additional missed checks from previos commit