Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev