add missing div
throw error for non implemented method
improved error handling
Improved error handling
Merge pull request #767 from dennishendriksen/master

Improved error handling + HTML fixes