Fixed exception issues
Merge branch 'master' of github.com:fedora-openstack/packstack
Merge pull request #44 from paramite/master

Fixed exception issues