Fix for error message bug on extents controller
Merge remote-tracking branch 'origin/master'