Removing dev error handling logic - bug source?