Merge "fs_mgr: correct error handling"