added default handler to the endpoint
Merge branch 'develop'