Removing error condition.. Need to check again..