Manual PR merge to remove redundant brackets after throw in 2 files, courtesy of kachkaev