Account for just about every possible case of missing properties. #21