Fixes for bugs reported by Fengguo related to throw action and empty
location.