bugfix crash if completion doesnt exist
Merge branch 'master' into 0.1.1