Merge pull request #24 from sitefusion/hotfix/6.0.8

Added a check to make sure databaseUsername and databasePassword are set...
Merge pull request #26 from sitefusion/develop

Develop
Corrected dead statement where SFException should be thrown
Merge branch 'hotfix/6.1.1' into develop