Bug/sms json objects

Probably safer to include the braces (`else { ... }`) to prevent fall through