Minor issue resolution (Fixes random 500 error)