Fixed all null related stuff