Fix for NullReferenceException.
Created version 0.2.0.0.