Format replacements
Merge branch '1.0.0-SP01'
Added exception-handling