Fixed invalid null assignment