Added logging of internal server errors
Merge branch 'master' of https://github.com/MacsDickinson/asafaharbor