Fix inconsistent behaviour exceeding quota limit

Change-Id: Ie49db5397d87a0c9a583b64e5de34460144b5956
Closes-bug: 1278449