Fixes Null Pointer Exception? Maybe?