throw error instead exit (#1323)

throw error instead exit (#1323) #1166