[BUGFIX] Gracefully handle invalid request with fallbacks

Fixes #1