Fixed crash on api start
Merge branch 'master' of https://github.com/andrenatal/gecko-dev