Created by: stefanoborini
Various fixes here and there to add more exception handling and better log messages