Added exception when samlib returns 500 error
Merge branch 'develop' into feat-theme-change