Continue to move over code to standard for error logging and handling in unexpected cases