Add return check for lock/unlock function

Add return check for lock/unlock function #1540