Added error message
Merge branch 'hapi8'