Fix NPE
Actually fix npe
Merge branch 'master' into custom-configuration-class

* master:
  moving from CreationException to ProvisionException
  moving to 0.6.1.5-SNAPSHOT
Merge pull request #4 from axiak/custom-configuration-class

Custom configuration class