Bugfixes

So this just does a small fix that solves a warning that logcat was giving me and hopefully make the app a little more prepared for the future.

As a side note, would it be better for me to keep debugging master or is there a branch that would be better to work on(i.e. v2)?