Removing exception - fail gracefully