diff --git a/store/checkpointmanager.go b/store/checkpointmanager.go
index 1df049b26..e179c3e27 100644
--- a/store/checkpointmanager.go
+++ b/store/checkpointmanager.go
@@ -81,6 +81,9 @@ func (manager *checkPointImpl) GetCheckpoint(checkpointKey string, checkpoint Ch
 	defer manager.mutex.Unlock()
 	blob, err := manager.store.Read(checkpointKey)
 	if err != nil {
+		if err == ErrKeyNotFound {
+			return ErrCheckpointNotFound
+		}
 		return err
 	}
 	err = checkpoint.UnmarshalCheckpoint(blob)