Trying to fix NullPointerExceptions
Merge branch 'master' of https://github.com/ionambrinoc/raspberry