Finial bug fix before 1.4.0 release
Make code more resilient to controllers not existing
Update prior to 1.4.1 release