Validation / errorhandling added