Merge pull request #42 from bphinz/buildfixes

Fix pointer initialization to prevent NULL events.