Revert to iPhone 6.1 (don't why it fails)
Add another safety check.