Changed: Exception behaviour