Updates to incorporate propeper error handling for boundary cases