diff --git a/src/securityflaw.h b/src/securityflaw.h
index 0ad953739ff6171ed7ecbe22f0556ea3425ce13b..80604450024290cfdbbc160fbce600c02d322504 100644
--- a/src/securityflaw.h
+++ b/src/securityflaw.h
@@ -1,3 +1,20 @@
+/****************************************************************************
+ *   Copyright (C) 2015 by Savoir-Faire Linux                               *
+ *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Lesser General Public             *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                          *
+ *   This library is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *   Lesser General Public License for more details.                        *
+ *                                                                          *
+ *   You should have received a copy of the GNU General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
 #ifndef SECURITY_FLAW_H
 #define SECURITY_FLAW_H
 
diff --git a/src/securityvalidationmodel.cpp b/src/securityvalidationmodel.cpp
index 3247b98a029f2bc41317d6d6b6e6be387b95c711..0d3439a38c07ccd25d71e8965d72c1fb3c3d190a 100644
--- a/src/securityvalidationmodel.cpp
+++ b/src/securityvalidationmodel.cpp
@@ -181,7 +181,7 @@ void SecurityValidationModelPrivate::update()
 
    /* The user certificate need to have a private key, otherwise it wont
     * be possible to encrypt anything */
-   if (( m_pAccount->tlsCertificate()->hasPrivateKey() == Certificate::CheckValues::FAILED) && (m_pAccount->tlsPrivateKeyCertificate()->exist()  == Certificate::CheckValues::FAILED)) {
+   if (( m_pAccount->tlsCertificate() && m_pAccount->tlsCertificate()->hasPrivateKey() == Certificate::CheckValues::FAILED) && (m_pAccount->tlsPrivateKeyCertificate() && m_pAccount->tlsPrivateKeyCertificate()->exist()  == Certificate::CheckValues::FAILED)) {
       m_lCurrentFlaws << _F(PRIVATE_KEY_MISSING,m_pAccount->tlsPrivateKeyCertificate()->type());
    }