Add catching & logging to manage functions