Making sure that null elements in the list don't cause a 500 error (NPE)
Return a 410 GONE response when trying to update an answer for a block that's been deleted
Merge branch 'master' into payment-database-schema