Fix for return to allow for silent errors