Added error handling
Merge branch 'master' of github.com:smaak/symfony-demo-project