Fixed two bugs that caused the app to crash when doing certain things
during a refresh.
Merge branch 'sixth_iteration' of https://github.com/MahApp/version1.git into sixth_iteration