Fix crash on nil
Merge branch 'distribution-plugin' into cirandas