Merge branch 'release/7.x-0.3' into develop
use exception instead of die()
release 7.x-0.4
Merge branch 'release/7.x-0.4'