Fixes bug 1093749 The patch set also returns a proper error instead of a internal server error when the quotas are reached. Change-Id: Ifc74ffa8b54faa70f5558bf5263830f5e71f58ae