Updated for Xcode 6 Beta 6

More if optional nil checks.