Temp fix for: <rdar://problem/3814810> REGRESSION (125-164): Exception adding nil...