Some fixes when vars are not defined
Merge branch 'paths' of github.com:richardhinkamp/bolt into paths