Restructured hash table calls. Still crashing on exit (null pointer exception)
Fixed uncaught null-pointer exception; no longer crashing on exit