All the things
Merge branch 'develop' into bug/sunray_value_non_recoverable_47830599
Changed error reported to the user.
Merge pull request #3 from waterfield/bug/sunray_value_non_recoverable_47830599

Bug/sunray value non recoverable 47830599