Added error handling and also updating error string
Merge branch 'develop' of github.com:SeanHurley/AndroidSolarPanelManager into develop