Mvp fixes

return none or raise