Fix issue #109 - Correct issue whereby null reference exception is thrown.