add checks for CommandLoader
add exception test for e-mail
Merge remote-tracking branch 'origin/master'