Added nil-catching scenerio to block form partial