Error 500 on the deliverables index view
Merge branch 'bugfix/error500'