Initialized data structures

Null pointer exception fix
Merge remote-tracking branch 'origin/local_patrick'