Avoid exception if error description turns out to be nil
Likely this is because the error is nil
Merge branch 'sandvox-2.7' into develop