After WAY to many hours of fiddling, I found the problem (or at least the problem for me).
The problem is the "fo_object_types" table. The new version sets the "plugin_id" to zero instead of null. Switching them back to Null fixed the problem.
Running the following queries on the database fixed the problem
USE feng;
ALTER TABLE fo_object_types
CHANGE COLUMN `plugin_id` `plugin_id` INT(10) UNSIGNED NULL DEFAULT NULL ;
UPDATE fo_object_types SET plugin_id = NULL WHERE plugin_id = 0;
Update 'feng' to the name of your database
And if you changed the prefix on your tables you might need to change the 'fo_object_types' to whatever your prefix was.
The first query changes the structure of the table to allow for null.
The second query changes row that had a "0" to Null.
Hope this helps others as well.