Fixing npe still...