Merge pull request #28 from manolo/master
Merge pull request #29 from manolo/master

Fixing an access exception when running in dev mode.
Fix null exception