Added Exception in common