add some more exeptions and implement history options
add some more exeptions and implement history options

--HG--
branch : wokkel-muc-client-support-24
extra : convert_revision : svn%3Ab33ecbfc-034c-dc11-8662-000475d9059e/branches/wokkel-muc-client-support-24%40117

thepaul/wokkel,ralphm/wokkel,thepaul/wokkel