Ember.Deferred now handles optional then handlers.

@wagenet I think this covers the issue you ran into, can you confirm?