Removed buggy error handling