Extra errorhandeling and comments