Fixed some unwanted behaviours

Added fallback in case of missing freeminer reference