Fix crash when indexPath is missing
Merge branch 'refactor/formsmanager'