Fixed path to run
Increased readability
Improved whitespace consistency
Fixed potential problems with file removal

Custom error handlers intercept warnings generated by command() even if
it's preceded with @. This is undesirable and makes explicite checks
reasonable.