Case 2796 - Fixed "non-object" error.