Added general error check.
Removed error throw.