Added a bit on null