#POULPE-499 Small refactoring regarding exceptions
#POULPE-499 Small refactoring regarding exceptions