updated base form mod, adding better error handling