correct internal server error from policy api endpoint
Merge branch 'release-0.4' into development