wp/CAROLINE-49/1: fix some bugs.
CAROLINE-49: Fix several crashes and config errors.
Merge pull request #134 from it-workshop/wp/CAROLINE-49/1

wp/CAROLINE-49/1: fix some bugs.