Squashed commit of the following:

commit 2352b6349e9d96c51b610db5758c9c6d0094f2dc
Author: Patrick Huang <pahuang@redhat.com>
Date:   Wed Jul 30 09:10:54 2014 +1000

    fix classloading issue

commit c1b0728b7310c6ffd24c1a0c75335b619405958d
Author: Patrick Huang <pahuang@redhat.com>
Date:   Tue Jul 29 11:21:44 2014 +1000

    rhbz1011310 - provide better error message when email service is down