Removed error catching