Fix exception if the block options cannot be resolved
Merge branch 'sonata/master'