Added a clause to avoid NullPointerException on SavePlace and remove unnecessary imports