Fixing issue with possibly unhandled errors.
Not null tests working.