Close issue #3. Could not reproduce issue but added some null checks just in case.