Hopefully fixed crash when openeing from explorer #229 #280

Merged
merged 2 commits into from May 23, 2012