minor change, replace error by throw
merge with inet-framework