decoupled apiexception
updated check error message
Merge branch 'develop'