Fix NPE in SharkEnv
Merge branch 'hive0.9' of https://github.com/amplab/shark into hive0.9