Fixes null check on content