Masking now handles null.
Version 0.2.6