Fix type for first argument to O
Prevent crash if NULL is passed

This happens in PDO on purpose, in other places this is an error and might
need better handling.
Fix for modifier o