Removed error string checks