Simplified error-handling
