Mweb 1043

@nandy-andy @RafLeszczynski @rogatty 
Can we use here `.then()` and `.fail()` instead of callback? If not we need to fix indentation in lines below.