Moved use case specific error message to correct place