FIX: Error code should work properly now