Remove catch to avoid warnings, and M.empty use