Fixed null pointer on janeway startup.
Merge branch 'dev-codonbleu' of https://github.com/zoccihedron/wpi-suite into fix-114NullPointerOnStartup
Merge pull request #115 from zoccihedron/fix-114NullPointerOnStartup

Fix 114 null pointer on startup