Changed some felhantering