Fixed possible dereference error
Merge branch 'master' of github.com:ZettaZete/tangelo