Merge remote-tracking branch 'origin'
Fixed crashing error when err is nil.

This causes a panic since err is nil whenever a user successfully is not
blocked.