Buffer is now allowed to be null