#267 - Fix app from crashing on start