Added earlier Starch\Controller check, less likely to miss problems