Removed catch-all exception handlers, removed hard-coded values