Removed the additional error check