Added better exception management and set the links in Reference as @NonNull.