diff --git a/src/tp04/Person.java b/src/tp04/Person.java
index bd8dac6a0fa095499a6e2049e6e6e255a94f82be..aa44356bcffb77fe83c01078c99cdf30c95bdd49 100644
--- a/src/tp04/Person.java
+++ b/src/tp04/Person.java
@@ -1,12 +1,14 @@
+package tp04;
+
 public class Person {
 
-    private int ID;
+    final private int ID;
     private String forename;
     private String name;
 
     private static int counter;
 
-    public Person(String name, String forename) {
+    public Person(String forename, String name) {
         this.forename = forename;
         this.name = name;
 
@@ -39,8 +41,12 @@ public class Person {
     }
 
     public boolean equals(Object other) {
+        if (other == null) {
+            return false;
+        }
         if (other.getClass() == this.getClass()) {
-            return other.ID  == this.ID;
+            Person otherPerson = (Person) other;
+            return otherPerson.getID() == this.ID;
         }
         return false;
     }