Raise correct exception on blocked operation

Closes-bug: #1314310

Change-Id: I99dda0e474c6fac2e37d95491e6dafbd48c0f79c
Merge "Raise correct exception on blocked operation"