Fixed wrong usage of SavannaException

Added defence against such wrong usage

Fixes bug #1220239

Change-Id: I391fe61a14987cac9c2a565b5049de22e1bbc9ae
Merge "Fixed wrong usage of SavannaException"