Merge r53381 from wmf-deployment. Throw more informational error on creation failure.