Made controller resolver more robust