Allow null response
Merge branch 'develop'