Added null catches to ALL assignment methods