Fix Com_Error for SP (similar to fix in 5c4285a)