defensive code in payment presenter
Merge branch 'development'