Merge "Revert "Fixed the lock times and populated error variable""