Fixed force closing / Added fail-safes and refresh options